From c48f92e394220b992648eeb8d871ed290786d286 Mon Sep 17 00:00:00 2001 From: groud Date: Wed, 9 Jan 2019 20:55:04 +0100 Subject: [PATCH] Fixes 2D bones selection --- editor/plugins/canvas_item_editor_plugin.cpp | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/editor/plugins/canvas_item_editor_plugin.cpp b/editor/plugins/canvas_item_editor_plugin.cpp index ea6c83f49c7..b0e812a130c 100644 --- a/editor/plugins/canvas_item_editor_plugin.cpp +++ b/editor/plugins/canvas_item_editor_plugin.cpp @@ -2033,16 +2033,19 @@ bool CanvasItemEditor::_gui_input_select(const Ref &p_event) { // Find the item to select CanvasItem *canvas_item = NULL; - Vector<_SelectResult> selection; - - // Retrieve the items - _get_canvas_items_at_pos(click, selection); // Retrieve the bones + Vector<_SelectResult> selection = Vector<_SelectResult>(); _get_bones_at_pos(click, selection); - if (!selection.empty()) { canvas_item = selection[0].item; + } else { + // Retrieve the canvas items + selection = Vector<_SelectResult>(); + _get_canvas_items_at_pos(click, selection); + if (!selection.empty()) { + canvas_item = selection[0].item; + } } if (!canvas_item) {