From f32a06e470f74f7cb209568c0cc215bd339db96c Mon Sep 17 00:00:00 2001
From: Nounours Heureux <schtroumps31@gmail.com>
Date: Sat, 2 Jan 2016 23:42:41 +0100
Subject: You can create an inherited scene based on an already opened scene.

---
 tools/editor/editor_node.cpp | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'tools/editor')

diff --git a/tools/editor/editor_node.cpp b/tools/editor/editor_node.cpp
index 9151e63df6..318f3505cc 100644
--- a/tools/editor/editor_node.cpp
+++ b/tools/editor/editor_node.cpp
@@ -3533,11 +3533,13 @@ Error EditorNode::load_scene(const String& p_scene, bool p_ignore_broken_deps,bo
 	}
 
 
-	for(int i=0;i<editor_data.get_edited_scene_count();i++) {
+	if(!p_set_inherited) {
+		for(int i=0;i<editor_data.get_edited_scene_count();i++) {
 
-		if (editor_data.get_scene_path(i)==p_scene) {
-			_scene_tab_changed(i);
-			return OK;
+			if (editor_data.get_scene_path(i)==p_scene) {
+				_scene_tab_changed(i);
+				return OK;
+			}
 		}
 	}
 
-- 
cgit v1.2.3