From 73de8bf16599e995019cdfaf6aeefbd767b522ff Mon Sep 17 00:00:00 2001
From: kobewi <kobewi4e@gmail.com>
Date: Tue, 24 Jun 2025 17:56:48 +0200
Subject: [PATCH] Generate scene ID for created built-in Resources

---
 editor/editor_resource_picker.cpp | 2 +-
 editor/scene_tree_dock.cpp        | 2 +-
 editor/shader_create_dialog.cpp   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/editor/editor_resource_picker.cpp b/editor/editor_resource_picker.cpp
index 4c0ebd273c2..4a8df19b424 100644
--- a/editor/editor_resource_picker.cpp
+++ b/editor/editor_resource_picker.cpp
@@ -497,7 +497,7 @@ void EditorResourcePicker::_edit_menu_cbk(int p_which) {
 
 			Resource *resp = Object::cast_to<Resource>(obj);
 			ERR_BREAK(!resp);
-			resp->set_path(_get_owner_path() + "::"); // Assign a base path for built-in Resources.
+			resp->set_path(_get_owner_path() + "::" + resp->generate_scene_unique_id()); // Assign a base path for built-in Resources.
 
 			EditorNode::get_editor_data().instantiate_object_properties(obj);
 
diff --git a/editor/scene_tree_dock.cpp b/editor/scene_tree_dock.cpp
index aae864323b8..99a8f5d1ffb 100644
--- a/editor/scene_tree_dock.cpp
+++ b/editor/scene_tree_dock.cpp
@@ -2562,7 +2562,7 @@ void SceneTreeDock::_script_created(Ref<Script> p_script) {
 	}
 
 	if (p_script->is_built_in()) {
-		p_script->set_path(edited_scene->get_scene_file_path() + "::");
+		p_script->set_path(edited_scene->get_scene_file_path() + "::" + p_script->generate_scene_unique_id());
 	}
 
 	EditorUndoRedoManager *undo_redo = EditorUndoRedoManager::get_singleton();
diff --git a/editor/shader_create_dialog.cpp b/editor/shader_create_dialog.cpp
index beb1e44549b..452855829c4 100644
--- a/editor/shader_create_dialog.cpp
+++ b/editor/shader_create_dialog.cpp
@@ -251,7 +251,7 @@ void fog() {
 		if (is_built_in) {
 			Node *edited_scene = get_tree()->get_edited_scene_root();
 			if (likely(edited_scene)) {
-				shader->set_path(edited_scene->get_scene_file_path() + "::");
+				shader->set_path(edited_scene->get_scene_file_path() + "::" + shader->generate_scene_unique_id());
 			}
 		} else {
 			String lpath = ProjectSettings::get_singleton()->localize_path(file_path->get_text());