Explorar o código

Fix crash when loading scene instance after node vanished from parent

(cherry picked from commit 78ffc2a987ed672c7fd9d2fa9f3e74ee047f917f)
Pedro J. Estébanez %!s(int64=3) %!d(string=hai) anos
pai
achega
0ebbc5b07c
Modificáronse 1 ficheiros con 6 adicións e 6 borrados
  1. 6 6
      scene/resources/packed_scene.cpp

+ 6 - 6
scene/resources/packed_scene.cpp

@@ -313,13 +313,13 @@ Node *SceneState::instance(GenEditState p_edit_state) const {
 					node->_set_owner_nocheck(owner);
 				}
 			}
-		}
 
-		// we only want to deal with pinned flag if instancing as pure main (no instance, no inheriting)
-		if (p_edit_state == GEN_EDIT_STATE_MAIN) {
-			_sanitize_node_pinned_properties(node);
-		} else {
-			node->remove_meta("_edit_pinned_properties_");
+			// we only want to deal with pinned flag if instancing as pure main (no instance, no inheriting)
+			if (p_edit_state == GEN_EDIT_STATE_MAIN) {
+				_sanitize_node_pinned_properties(node);
+			} else {
+				node->remove_meta("_edit_pinned_properties_");
+			}
 		}
 
 		ret_nodes[i] = node;