From 8535a0f6c25f548d27591881e390c7ba12bfa237 Mon Sep 17 00:00:00 2001
From: Robert Yevdokimov <robert.yevdokimov@autStand.com>
Date: Sat, 30 Mar 2024 18:42:01 -0400
Subject: [PATCH] Add inherit parameter to `open_scene_from_path`

---
 doc/classes/EditorInterface.xml                   | 3 ++-
 editor/editor_interface.compat.inc                | 5 +++++
 editor/editor_interface.cpp                       | 6 +++---
 editor/editor_interface.h                         | 4 ++--
 editor/editor_node.cpp                            | 4 ++--
 editor/editor_node.h                              | 2 +-
 misc/extension_api_validation/4.3-stable.expected | 8 ++++++++
 7 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/doc/classes/EditorInterface.xml b/doc/classes/EditorInterface.xml
index 795c5c1c2f0b..6098405db1ce 100644
--- a/doc/classes/EditorInterface.xml
+++ b/doc/classes/EditorInterface.xml
@@ -241,8 +241,9 @@
 		<method name="open_scene_from_path">
 			<return type="void" />
 			<param index="0" name="scene_filepath" type="String" />
+			<param index="1" name="set_inherited" type="bool" default="false" />
 			<description>
-				Opens the scene at the given path.
+				Opens the scene at the given path. If [param set_inherited] is [code]true[/code], a new inherited scene will be created.
 			</description>
 		</method>
 		<method name="play_current_scene">
diff --git a/editor/editor_interface.compat.inc b/editor/editor_interface.compat.inc
index f5b35931fe76..262238635052 100644
--- a/editor/editor_interface.compat.inc
+++ b/editor/editor_interface.compat.inc
@@ -40,9 +40,14 @@ void EditorInterface::_popup_property_selector_bind_compat_94323(Object *p_objec
 	popup_property_selector(p_object, p_callback, p_type_filter, String());
 }
 
+void EditorInterface::_open_scene_from_path_bind_compat_90057(const String &scene_path) {
+	return open_scene_from_path(scene_path, false);
+}
+
 void EditorInterface::_bind_compatibility_methods() {
 	ClassDB::bind_compatibility_method(D_METHOD("popup_node_selector", "callback", "valid_types"), &EditorInterface::_popup_node_selector_bind_compat_94323, DEFVAL(TypedArray<StringName>()));
 	ClassDB::bind_compatibility_method(D_METHOD("popup_property_selector", "object", "callback", "type_filter"), &EditorInterface::_popup_property_selector_bind_compat_94323, DEFVAL(PackedInt32Array()));
+	ClassDB::bind_compatibility_method(D_METHOD("open_scene_from_path", "scene_path"), &EditorInterface::_open_scene_from_path_bind_compat_90057);
 }
 
 #endif
diff --git a/editor/editor_interface.cpp b/editor/editor_interface.cpp
index fa6198f6950d..99015cb2509e 100644
--- a/editor/editor_interface.cpp
+++ b/editor/editor_interface.cpp
@@ -407,12 +407,12 @@ void EditorInterface::edit_script(const Ref<Script> &p_script, int p_line, int p
 	ScriptEditor::get_singleton()->edit(p_script, p_line - 1, p_col - 1, p_grab_focus);
 }
 
-void EditorInterface::open_scene_from_path(const String &scene_path) {
+void EditorInterface::open_scene_from_path(const String &scene_path, bool p_set_inherited) {
 	if (EditorNode::get_singleton()->is_changing_scene()) {
 		return;
 	}
 
-	EditorNode::get_singleton()->open_request(scene_path);
+	EditorNode::get_singleton()->open_request(scene_path, p_set_inherited);
 }
 
 void EditorInterface::reload_scene_from_path(const String &scene_path) {
@@ -586,7 +586,7 @@ void EditorInterface::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("edit_resource", "resource"), &EditorInterface::edit_resource);
 	ClassDB::bind_method(D_METHOD("edit_node", "node"), &EditorInterface::edit_node);
 	ClassDB::bind_method(D_METHOD("edit_script", "script", "line", "column", "grab_focus"), &EditorInterface::edit_script, DEFVAL(-1), DEFVAL(0), DEFVAL(true));
-	ClassDB::bind_method(D_METHOD("open_scene_from_path", "scene_filepath"), &EditorInterface::open_scene_from_path);
+	ClassDB::bind_method(D_METHOD("open_scene_from_path", "scene_filepath", "set_inherited"), &EditorInterface::open_scene_from_path, DEFVAL(false));
 	ClassDB::bind_method(D_METHOD("reload_scene_from_path", "scene_filepath"), &EditorInterface::reload_scene_from_path);
 
 	ClassDB::bind_method(D_METHOD("get_open_scenes"), &EditorInterface::get_open_scenes);
diff --git a/editor/editor_interface.h b/editor/editor_interface.h
index 20d66d71f53b..53b87dcc5de0 100644
--- a/editor/editor_interface.h
+++ b/editor/editor_interface.h
@@ -84,7 +84,7 @@ class EditorInterface : public Object {
 #ifndef DISABLE_DEPRECATED
 	void _popup_node_selector_bind_compat_94323(const Callable &p_callback, const TypedArray<StringName> &p_valid_types = TypedArray<StringName>());
 	void _popup_property_selector_bind_compat_94323(Object *p_object, const Callable &p_callback, const PackedInt32Array &p_type_filter = PackedInt32Array());
-
+	void _open_scene_from_path_bind_compat_90057(const String &scene_path);
 	static void _bind_compatibility_methods();
 #endif
 
@@ -156,7 +156,7 @@ class EditorInterface : public Object {
 	void edit_resource(const Ref<Resource> &p_resource);
 	void edit_node(Node *p_node);
 	void edit_script(const Ref<Script> &p_script, int p_line = -1, int p_col = 0, bool p_grab_focus = true);
-	void open_scene_from_path(const String &scene_path);
+	void open_scene_from_path(const String &scene_path, bool p_set_inherited = false);
 	void reload_scene_from_path(const String &scene_path);
 
 	PackedStringArray get_open_scenes() const;
diff --git a/editor/editor_node.cpp b/editor/editor_node.cpp
index 66fd2cf904ec..b5c7519f4b3a 100644
--- a/editor/editor_node.cpp
+++ b/editor/editor_node.cpp
@@ -4367,7 +4367,7 @@ void EditorNode::replace_history_reimported_nodes(Node *p_original_root_node, No
 	}
 }
 
-void EditorNode::open_request(const String &p_path) {
+void EditorNode::open_request(const String &p_path, bool p_set_inherited) {
 	if (!opening_prev) {
 		List<String>::Element *prev_scene_item = previous_scenes.find(p_path);
 		if (prev_scene_item != nullptr) {
@@ -4375,7 +4375,7 @@ void EditorNode::open_request(const String &p_path) {
 		}
 	}
 
-	load_scene(p_path); // As it will be opened in separate tab.
+	load_scene(p_path, false, p_set_inherited); // As it will be opened in separate tab.
 }
 
 bool EditorNode::has_previous_scenes() const {
diff --git a/editor/editor_node.h b/editor/editor_node.h
index 4127dd1539db..0d5d6ba50ca9 100644
--- a/editor/editor_node.h
+++ b/editor/editor_node.h
@@ -754,7 +754,7 @@ class EditorNode : public Node {
 	void push_node_item(Node *p_node);
 	void hide_unused_editors(const Object *p_editing_owner = nullptr);
 
-	void open_request(const String &p_path);
+	void open_request(const String &p_path, bool p_set_inherited = false);
 	void edit_foreign_resource(Ref<Resource> p_resource);
 
 	bool is_resource_read_only(Ref<Resource> p_resource, bool p_foreign_resources_are_writable = false);
diff --git a/misc/extension_api_validation/4.3-stable.expected b/misc/extension_api_validation/4.3-stable.expected
index ad77e30e11cc..3bdd567fa5ce 100644
--- a/misc/extension_api_validation/4.3-stable.expected
+++ b/misc/extension_api_validation/4.3-stable.expected
@@ -80,3 +80,11 @@ GH-94434
 Validate extension JSON: Error: Field 'classes/OS/methods/execute_with_pipe/arguments': size changed value in new API, from 2 to 3.
 
 Optional argument added. Compatibility method registered.
+
+
+GH-90057
+--------
+Validate extension JSON: Error: Field 'classes/EditorInterface/methods/open_scene_from_path/arguments': size changed value in new API, from 1 to 2.
+
+Added optional argument to open_scene_from_path to create a new inherited scene.
+Compatibility method registered.