From b8a524efa35aabc6537f7d0ca79b0cd086ba8a47 Mon Sep 17 00:00:00 2001 From: jlahman Date: Wed, 16 Jan 2019 01:11:11 -0500 Subject: Fix order of a nullptr test in canvas item editor --- editor/plugins/canvas_item_editor_plugin.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/editor/plugins/canvas_item_editor_plugin.cpp b/editor/plugins/canvas_item_editor_plugin.cpp index b0e812a130..86d6799b19 100644 --- a/editor/plugins/canvas_item_editor_plugin.cpp +++ b/editor/plugins/canvas_item_editor_plugin.cpp @@ -573,10 +573,10 @@ bool CanvasItemEditor::_get_bone_shape(Vector *shape, Vector * Node2D *from_node = Object::cast_to(ObjectDB::get_instance(bone->key().from)); Node2D *to_node = Object::cast_to(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; -- cgit v1.2.3