Fix crash on reimport scene with animations #95084
Merged
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
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.
At first, I thought the issue was in the importation, but it turns out it's a regression from #94093. In reality, the fact that the reimportation actually works caused the problem.
The issue was caused by the current editable object in the
editor_history. After the reimportation,EditorNode::_edit_currentis called inEditorNode::_set_current_scene_nocheck, but at that time, the ObjectID from the originalAnimationPlayeris still valid, and thatAnimationPlayeris kept by theAnimationPlayerPlugin. Eventually, the originalAnimationPlayergets destroyed, causing the crash.The solution was to replace the old ObjectID with the new ObjectID for all the new nodes in the reimportation process. The bonus here is that the history is kept intact, and the previous and next buttons in the Inspector now work after a reimportation!