Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow .gdshader files in 3to4 conversion #72334

Merged
merged 1 commit into from
Feb 2, 2023

Conversation

tbxMb
Copy link
Contributor

@tbxMb tbxMb commented Jan 29, 2023

I added a check for ".gdshader" files in this line, as proposed by @qarmin in #69597

if (file_name.ends_with(".gd") || file_name.ends_with(".shader") || file_name.ends_with(".tscn") || file_name.ends_with(".tres") || file_name.ends_with(".godot") || file_name.ends_with(".cs") || file_name.ends_with(".csproj"))

Bugsquad edit: This closes #69597.

@akien-mga
Copy link
Member

Needs a rebase to fix a temporary CI issue.

@tbxMb
Copy link
Contributor Author

tbxMb commented Feb 1, 2023

Is there anything i need to do or is this just waiting to be merged ?

@akien-mga
Copy link
Member

akien-mga commented Feb 1, 2023

See my previous comment. The CI didn't pass, and it needs to be rebased.
If you're not familiar with rebasing PRs, I can do it.

Edit: I pushed a rebase myself eventually.

@akien-mga akien-mga merged commit 315d3c4 into godotengine:master Feb 2, 2023
@akien-mga
Copy link
Member

Thanks! And congrats for your first merged Godot contribution 🎉

@tbxMb tbxMb deleted the conv-ext-shader branch February 3, 2023 17:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

External shaders saved to .gdshader files are not converted by the project upgrade tool
3 participants