asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Merge pull request #56622 from Pineapple/scenestate-optimizations

Browse source
This commit is contained in:
Rémi Verschelde 2022-01-18 16:35:32 +01:00 committed by GitHub
commit 45cb12955f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
scene/resources/packed_scene.cpp
View file

@ -175,14 +175,12 @@ Node *SceneState::instantiate(GenEditState p_edit_state) const {
#endif
}
} else {
Object *obj = nullptr;
//node belongs to this scene and must be created
Object *obj = ClassDB::instantiate(snames[n.type]);
if (ClassDB::is_class_enabled(snames[n.type])) {
//node belongs to this scene and must be created
obj = ClassDB::instantiate(snames[n.type]);
}
node = Object::cast_to<Node>(obj);
if (!Object::cast_to<Node>(obj)) {
if (!node) {
if (obj) {
memdelete(obj);
obj = nullptr;
@ -203,9 +201,9 @@ Node *SceneState::instantiate(GenEditState p_edit_state) const {
if (!obj) {
obj = memnew(Node);
}
}
node = Object::cast_to<Node>(obj);
node = Object::cast_to<Node>(obj);
}
}
if (node) {