-
-
Notifications
You must be signed in to change notification settings - Fork 21.4k
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 reimporting scene with default values selected #79907
Fix reimporting scene with default values selected #79907
Conversation
Although everything seems to be working now, I still doubt whether we need to remove the if-condition in this block: godot/editor/import/resource_importer_scene.cpp Lines 2433 to 2442 in 202e4b2
|
@aaronfranke is also working in this area from the gltf document |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Tested, this works as expected, and the fix makes sense.
Although everything seems to be working now, I still doubt whether we need to remove the if-condition in this block:
I have already fixed this logic in PR #79774, feel free to give it a review.
This commit fixes godotengine#78140 When the scene was re-imported with non-default values of some settings, re-importing it again using default values for those settings didn't have the effect. The problem was that when handling the reimport, a wrong dictionary of the settings was used.
7a70a53
to
8b729e5
Compare
Thanks! I hit the merge button myself due to how simple the fix is and I tested it. |
For the record for future commits, we don't usually prefix commits with a type like "[bugfix]". The title starts with "Fix" and makes it clear that it's fixing a bug already. |
Just in case, if there are more maintenance releases planned for 4.0, this PR can be cherry-picked to 4.0 as well, as the change is trivial, and the bug was originally reported for 4.0.3. |
I think for something like that we'd suggest updating to 4.1.x instead. |
Cherry-picked for 4.1.3. |
This commit fixes #78140
When the scene was re-imported with non-default values of some settings, re-importing it again using default values for those settings didn't have the effect. For example, the ticket #78140 mentions this issue with "Root Type" setting, however the problem affected any setting.
The reason of the problem was that when handling the reimport, a wrong dictionary object of the settings was used.