diff options
author | RĂ©mi Verschelde <remi@verschelde.fr> | 2022-03-25 09:15:45 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-03-25 09:15:45 +0100 |
commit | 277333bd243c59d36a043089c5cffa28182b2fb5 (patch) | |
tree | 1ef7889e999d1cef847f2f51b5ec11588308555c | |
parent | 819dad19f6db1e7685d0a012caefc9894356edaf (diff) | |
parent | ab21ab80ba319c7ecfadc25ddccd12f7a299a708 (diff) |
Merge pull request #59472 from KoBeWi/data_migration
Make resource unique when pasting to another scene
-rw-r--r-- | editor/editor_resource_picker.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/editor/editor_resource_picker.cpp b/editor/editor_resource_picker.cpp index a7b2a4cfa6..53f1a689d6 100644 --- a/editor/editor_resource_picker.cpp +++ b/editor/editor_resource_picker.cpp @@ -327,6 +327,13 @@ void EditorResourcePicker::_edit_menu_cbk(int p_which) { case OBJ_MENU_PASTE: { edited_resource = EditorSettings::get_singleton()->get_resource_clipboard(); + if (edited_resource->is_built_in() && EditorNode::get_singleton()->get_edited_scene() && + edited_resource->get_path().get_slice("::", 0) != EditorNode::get_singleton()->get_edited_scene()->get_scene_file_path()) { + // Automatically make resource unique if it belongs to another scene. + _edit_menu_cbk(OBJ_MENU_MAKE_UNIQUE); + return; + } + emit_signal(SNAME("resource_changed"), edited_resource); _update_resource(); } break; |