summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2020-10-26 22:59:29 +0100
committerGitHub <noreply@github.com>2020-10-26 22:59:29 +0100
commit7b27dccbe0832e1231ff842a3a2c6e97a76660f3 (patch)
tree1e12f17051bb8958490aa33c7f480e4b43564755
parent6bf935d7867e21bc371c59182364cd50b86520c1 (diff)
parenta2c1593f253f9810556ae48c8e5927bc50754177 (diff)
Merge pull request #43099 from timothyqiu/instanced-revert
Fixes property revert after saving instanced scene
-rw-r--r--editor/editor_inspector.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/editor/editor_inspector.cpp b/editor/editor_inspector.cpp
index 9900e8184d..601f0ad735 100644
--- a/editor/editor_inspector.cpp
+++ b/editor/editor_inspector.cpp
@@ -358,10 +358,6 @@ bool EditorPropertyRevert::may_node_be_in_instance(Node *p_node) {
Node *node = p_node;
while (node) {
- if (node->get_scene_instance_state().is_valid()) {
- might_be = true;
- break;
- }
if (node == edited_scene) {
if (node->get_scene_inherited_state().is_valid()) {
might_be = true;
@@ -370,6 +366,10 @@ bool EditorPropertyRevert::may_node_be_in_instance(Node *p_node) {
might_be = false;
break;
}
+ if (node->get_scene_instance_state().is_valid()) {
+ might_be = true;
+ break;
+ }
node = node->get_owner();
}