godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes property revert after saving instanced scene

Browse Source 
(cherry picked from commit a2c1593f25)
This commit is contained in:
Haoyu Qiu 2020-10-27 00:07:09 +08:00 committed by Rémi Verschelde
parent f41cc7d644
commit a973bc9530
No known key found for this signature in database
GPG Key ID: C3336907360768E1
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
editor/editor_inspector.cpp
View File

@ -318,11 +318,6 @@ bool EditorPropertyRevert::may_node_be_in_instance(Node *p_node) {
Node *node = p_node; Node *node = p_node;
while (node) { while (node) {
if (node->get_scene_instance_state().is_valid()) {
might_be = true;
break;
}
if (node == edited_scene) { if (node == edited_scene) {
if (node->get_scene_inherited_state().is_valid()) { if (node->get_scene_inherited_state().is_valid()) {
might_be = true; might_be = true;
@ -331,6 +326,10 @@ bool EditorPropertyRevert::may_node_be_in_instance(Node *p_node) {
might_be = false; might_be = false;
break; break;
} }
if (node->get_scene_instance_state().is_valid()) {
might_be = true;
break;
}
node = node->get_owner(); node = node->get_owner();
} }