summaryrefslogtreecommitdiff
path: root/editor/plugins/canvas_item_editor_plugin.cpp
diff options
context:
space:
mode:
authorgroud <gilles.roudiere@gmail.com>2019-01-09 20:55:04 +0100
committergroud <gilles.roudiere@gmail.com>2019-01-09 20:55:04 +0100
commitc48f92e394220b992648eeb8d871ed290786d286 (patch)
tree49a3a3c15f971b95dbf25499c1efb48e0c8f92c2 /editor/plugins/canvas_item_editor_plugin.cpp
parent382f0991ee7ece2a99cfbdbf641d46777b8c8edf (diff)
Fixes 2D bones selection
Diffstat (limited to 'editor/plugins/canvas_item_editor_plugin.cpp')
-rw-r--r--editor/plugins/canvas_item_editor_plugin.cpp13
1 files changed, 8 insertions, 5 deletions
diff --git a/editor/plugins/canvas_item_editor_plugin.cpp b/editor/plugins/canvas_item_editor_plugin.cpp
index ea6c83f49c..b0e812a130 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<InputEvent> &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) {