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

3 files changed, 18 insertions, 0 deletions

diff --git a/scene/resources/packed_scene.cpp b/scene/resources/packed_scene.cpp
index d2795bddb8..03127620f7 100644
--- a/scene/resources/packed_scene.cpp
+++ b/scene/resources/packed_scene.cpp
@@ -1597,6 +1597,16 @@ Node *PackedScene::instance(bool p_gen_edit_state) const {
 	return s;
 }
 
+void PackedScene::replace_state(Ref<SceneState> p_by) {
+
+	state=p_by;
+	state->set_path(get_path());
+#ifdef TOOLS_ENABLED
+	state->set_last_modified_time(get_last_modified_time());
+#endif
+
+}
+
 void PackedScene::recreate_state() {
 
 	state = Ref<SceneState>( memnew( SceneState ));
diff --git a/scene/resources/packed_scene.h b/scene/resources/packed_scene.h
index 415357b61f..00a812f16a 100644
--- a/scene/resources/packed_scene.h
+++ b/scene/resources/packed_scene.h
@@ -198,6 +198,7 @@ public:
 	Node *instance(bool p_gen_edit_state=false) const;
 
 	void recreate_state();
+	void replace_state(Ref<SceneState> p_by);
 
 	virtual void set_path(const String& p_path,bool p_take_over=false);
 #ifdef TOOLS_ENABLED
diff --git a/scene/resources/scene_format_text.cpp b/scene/resources/scene_format_text.cpp
index 2552f682fa..5450b9e2ac 100644
--- a/scene/resources/scene_format_text.cpp
+++ b/scene/resources/scene_format_text.cpp
@@ -302,6 +302,10 @@ Error ResourceInteractiveLoaderText::poll() {
 			if (error) {
 				if (error!=ERR_FILE_EOF) {
 					_printerr();
+				} else {
+					if (!ResourceCache::has(res_path)) {
+						resource->set_path(res_path);
+					}
 				}
 				return error;
 			}
@@ -403,6 +407,9 @@ Error ResourceInteractiveLoaderText::poll() {
 					_printerr();
 				} else {
 					resource=packed_scene;
+					if (!ResourceCache::has(res_path)) {
+						packed_scene->set_path(res_path);
+					}
 				}
 				return error;
 			}