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

Merge pull request #55056 from RandomShaper/fix_crash_instantiate

Browse Source
This commit is contained in:
Rémi Verschelde 2021-11-17 15:54:38 +01:00 committed by GitHub
commit 0ef092a138
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scene/resources/packed_scene.cpp
View File

@ -315,7 +315,6 @@ Node *SceneState::instantiate(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) {
@ -323,6 +322,7 @@ Node *SceneState::instantiate(GenEditState p_edit_state) const {
} else {
node->remove_meta("_edit_pinned_properties_");
}
}
ret_nodes[i] = node;