Fix ownership bugs in node copy and pasting. #83596
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
SaracenOne
force-pushed
the
node_copy_paste_fix
branch
from
a1af891 to
861cc7b
Compare
KoBeWi
reviewed
Nov 4, 2023
KoBeWi
reviewed
Nov 4, 2023
Comment on lines
507
to
510
| if (!duplimap.has(F) || F == node) { | ||
| continue; | ||
| } | ||
| Node *d = duplimap[F]; |
There was a problem hiding this comment.
Suggested change
| if (!duplimap.has(F) || F == node) { | |
| continue; | |
| } | |
| Node *d = duplimap[F]; | |
| if (F == node) { | |
| continue; | |
| } | |
| HashMap<const Node *, Node *>::Iterator G = duplimap.find(F); | |
| if (!G) { | |
| continue; | |
| } | |
| Node *d = G->value; |
Unrelated to this PR, but this code can be improved.
KoBeWi
approved these changes
Nov 4, 2023
SaracenOne
force-pushed
the
node_copy_paste_fix
branch
from
861cc7b to
26576cc
Compare
|
Converted to HashSet now. |
|
Thanks! |
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.
The implementation of this is a little bit clunky, but it seems to work. The reason to maintain an extra list of nodes is because it currently it seems there's no way to distinguish between either nodes owned by the selected nodes and nodes we actually want to reassign to the new edited scene. I tried initially setting them to just nullptr owners instead, but this led to it including actual ownerless nodes being included in the copy/paste. Maintaining an extra list seems to solve this ambiguity.
Closes #83594
While an independent enhancement, would also recommend merging this PR too which provides complimentary functionality and fixes to re-enable duplication of foreign nodes #83597