-Make sure scenes properly update when switching tabs, even if sub-instances changed. Fixes #3201

2 files changed, 14 insertions, 3 deletions

diff --git a/tools/editor/editor_data.cpp b/tools/editor/editor_data.cpp
index d79c1ff466..5e613c658b 100644
--- a/tools/editor/editor_data.cpp
+++ b/tools/editor/editor_data.cpp
@@ -499,8 +499,8 @@ void EditorData::remove_scene(int p_idx){
 
 bool EditorData::_find_updated_instances(Node* p_root,Node *p_node,Set<String> &checked_paths) {
 
-	if (p_root!=p_node && p_node->get_owner()!=p_root && !p_root->is_editable_instance(p_node->get_owner()))
-		return false;
+//	if (p_root!=p_node && p_node->get_owner()!=p_root && !p_root->is_editable_instance(p_node->get_owner()))
+//		return false;
 
 	Ref<SceneState> ss;
 
diff --git a/tools/editor/editor_node.cpp b/tools/editor/editor_node.cpp
index 9258637a74..4b965ab9cf 100644
--- a/tools/editor/editor_node.cpp
+++ b/tools/editor/editor_node.cpp
@@ -3623,7 +3623,18 @@ Error EditorNode::load_scene(const String& p_scene, bool p_ignore_broken_deps,bo
 		add_io_error(txt);
 	}
 
-	sdata->set_path(lpath,true); //take over path
+	if (ResourceCache::has(lpath)) {
+		//used from somewhere else? no problem! update state
+		Ref<PackedScene> ps = Ref<PackedScene>( ResourceCache::get(lpath)->cast_to<PackedScene>() );
+		if (ps.is_valid()) {
+			ps->replace_state( sdata->get_state() );
+			ps->set_last_modified_time( sdata->get_last_modified_time() );
+			sdata=ps;
+		}
+
+	} else {
+		sdata->set_path(lpath,true); //take over path
+	}
 
 	Node*new_scene=sdata->instance(true);