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

Fix the uid field of the tscn/res file is lost when the external dependency is updated #70234

Merged
merged 1 commit into from
Apr 25, 2023

Conversation

Rindbee
Copy link
Contributor

@Rindbee Rindbee commented Dec 18, 2022

Solve the problem that the title tag is missing the uid field in #69794.

Hope this helps for #62258.

@Calinou Calinou added this to the 4.0 milestone Dec 18, 2022
@akien-mga
Copy link
Member

Superseded by #72257 I believe.

@Rindbee
Copy link
Contributor Author

Rindbee commented Feb 18, 2023

This issue is still not fixed in v4.0.rc.custom_build [0c27edf]. See:

0.mp4

@KoBeWi KoBeWi reopened this Feb 18, 2023
@KoBeWi KoBeWi removed the archived label Feb 18, 2023
@KoBeWi
Copy link
Member

KoBeWi commented Feb 18, 2023

Ah yes, the code duplication.

Copy link
Member

@KoBeWi KoBeWi left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I only glanced at the changes, but it seems to be doing the same thing that every ResourceLoaderText method repeats.

@Rindbee
Copy link
Contributor Author

Rindbee commented Feb 18, 2023

I think it is better to update dependencies separately from updating version. So that, other tags except ext_resource can be copied as-is when updating dependencies (This method just update ext_resource tags).

This code actually just updates the version number. I'm not sure whether other places need to be updated when the version is updated.

@akien-mga akien-mga modified the milestones: 4.0, 4.1 Feb 18, 2023
@akien-mga
Copy link
Member

I've definitely seen this kind of problem when working on a game jam with multiple folks, whose commits in Git would often lack the UID for some scenes for whatever reason, which my Godot editor would then add, creating needless Git noise.

@akien-mga akien-mga merged commit bbecc8a into godotengine:master Apr 25, 2023
@akien-mga
Copy link
Member

Thanks!

@Rindbee Rindbee deleted the fix-uid-lost branch April 25, 2023 22:08
@YuriSizov
Copy link
Contributor

Cherry-picked for 4.0.3.

@Flavelius
Copy link
Contributor

I think this is one of those cases that i also tried to fix #75103
But i had to do it because without it the other thing i tried to fix wasn't fixed.

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.

6 participants