Merge pull request #60500 from KoBeWi/scene_crasher

godotengine · Apr 25, 2022 · e246d08 · e246d08
2 parents 68ee730 + 675594e
commit e246d08
Showing 1 changed file with 10 additions and 4 deletions.
diff --git a/editor/editor_properties.cpp b/editor/editor_properties.cpp
@@ -2975,10 +2975,16 @@ void EditorPropertyResource::_set_read_only(bool p_read_only) {
 };
 
 void EditorPropertyResource::_resource_selected(const RES &p_resource, bool p_edit) {
-	if (p_resource->is_built_in() && !p_resource->get_path().is_empty() && p_resource->get_path().get_slice("::", 0) != EditorNode::get_singleton()->get_edited_scene()->get_scene_file_path()) {
-		// If the resource belongs to another scene, edit it in that scene instead.
-		EditorNode::get_singleton()->call_deferred("edit_foreign_resource", p_resource);
-		return;
+	if (p_resource->is_built_in() && !p_resource->get_path().is_empty()) {
+		String parent = p_resource->get_path().get_slice("::", 0);
+		List<String> extensions;
+		ResourceLoader::get_recognized_extensions_for_type("PackedScene", &extensions);
+
+		if (extensions.find(parent.get_extension()) && (!EditorNode::get_singleton()->get_edited_scene() || EditorNode::get_singleton()->get_edited_scene()->get_scene_file_path() == parent)) {
+			// If the resource belongs to another scene, edit it in that scene instead.
+			EditorNode::get_singleton()->call_deferred("edit_foreign_resource", p_resource);
+			return;
+		}
 	}
 
 	if (!p_edit && use_sub_inspector) {