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

Removed redundant ClassDB::is_class_enabled() and moved second dynamic_cast inside worst case if

Browse source
This commit is contained in:
Bartłomiej T. Listwon 2022-01-08 14:02:43 +01:00
parent 13d25f9980
commit b6cfc55113
1 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
scene/resources/packed_scene.cpp
View file

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