Browse Source

Merge pull request #25022 from jlahman/nullptr-test-order-fix

Fix order of a nullptr test in canvas item editor
Rémi Verschelde 6 years ago
parent
commit
f2dd477223
1 changed files with 2 additions and 2 deletions
  1. 2 2
      editor/plugins/canvas_item_editor_plugin.cpp

+ 2 - 2
editor/plugins/canvas_item_editor_plugin.cpp

@@ -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;