Fix loading packed scene with editable children at runtime #49664
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
pouleyKetchoupp
added
bug
topic:core
cherrypick:3.x
pouleyKetchoupp
force-pushed
the
fix-editable-duplicated
branch
from
2475c8f
to
f35b52b
Compare
reduz
approved these changes
Aug 24, 2021
|
@pouleyKetchoupp This needs a rebase :) |
pouleyKetchoupp
force-pushed
the
fix-editable-duplicated
branch
from
f35b52b
to
9e8fdb4
Compare
At runtime, packed scenes with nodes marked as editable instance where saved with node type tags, which prevented the scene to be then loaded as an instance, causing duplicated nodes in the tree. This change ensures nodes marked as editable instances and their owned children are properly set as instances. That doesn't make a difference in the editor, since such nodes where already set as instances based on their instance state, but it helps at runtime where instance states are disabled. Co-authored-by: latorril <[email protected]>
pouleyKetchoupp
force-pushed
the
fix-editable-duplicated
branch
from
9e8fdb4
to
fab88a8
Compare
mhilbrunner
approved these changes
Aug 28, 2021
There was a problem hiding this comment.
Built & tested locally, tests run fine, works in my tests projects, and I could verify that it fixes the issue. I couldn't find anything that this breaks, and the code looks fine too.
Looking at the history of the file, it doesn't seem like anyone besides @pouleyKetchoupp has touched this code (outside of small style changes or as side effect or changes elsewhere) much for at least the last year.
|
Thanks for this! |
|
Cherry-picked for 3.4. |
akien-mga
removed
the
cherrypick:3.x
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #49660
At runtime, packed scenes with nodes marked as editable instance where saved with node type tags, which prevented the scene to be then loaded as an instance, causing duplicated nodes in the tree.
This change ensures nodes marked as editable instances and their owned children are properly set as instances.
That doesn't make a difference in the editor, since such nodes where already set as instances based on their instance state, but it helps at runtime where instance states are disabled.
Credits to @latorril for finding the issue and investigating the cause.