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

Fix order of a nullptr test in canvas item editor

This commit is contained in:
jlahman 2019-01-16 01:11:11 -05:00
parent ffcb5cd18c
commit b8a524efa3
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
editor/plugins/canvas_item_editor_plugin.cpp
View File

@ -573,10 +573,10 @@ bool CanvasItemEditor::_get_bone_shape(Vector<Vector2> *shape, Vector<Vector2> *
Node2D *from_node = Object::cast_to<Node2D>(ObjectDB::get_instance(bone->key().from));
Node2D *to_node = Object::cast_to<Node2D>(ObjectDB::get_instance(bone->key().to));
if (!from_node->is_inside_tree())
return false; //may have been removed
if (!from_node)
return false;
if (!from_node->is_inside_tree())
return false; //may have been removed
if (!to_node && bone->get().length == 0)
return false;