Fix internal resource detecting when pasting nodes #45950
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
akien-mga
reviewed
Feb 13, 2021
| @@ -2921,7 +2921,7 @@ void SceneTreeDock::_create_remap_for_node(Node *p_node, Map<RES, RES> &r_remap) | |||
| if (v.is_ref()) { | |||
| RES res = v; | |||
| if (res.is_valid()) { | |||
| if (res->get_path() == "" && !r_remap.has(res)) { | |||
| if ((res->get_path() == "" || res->get_path().find("::") > -1) && !r_remap.has(res)) { | |||
There was a problem hiding this comment.
On phone so I can't check, but I think we added some is_builtin() method somewhere (or similar name) to do exactly this kind of check.
There was a problem hiding this comment.
I found only _is_built_in_script(). Although maybe adding such method to Resource would make sense to avoid problems like this.
There was a problem hiding this comment.
Yeah that's the one I had in mind I guess. That's probably material for another PR but I agree that it could be added to Resource (or Script? more local, but would require casting before calling).
akien-mga
approved these changes
Feb 18, 2021
|
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.
While backporting #34892 I discovered a "small" bug. Turns out built-in resources don't always have empty path, so you need additional check.