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

Merge pull request #24871 from groud/fix_bones_selection

Browse Source 
Fixes 2D bones selection
This commit is contained in:
Rémi Verschelde 2019-01-10 12:09:24 +01:00 committed by GitHub
commit ebfd78ad7f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
editor/plugins/canvas_item_editor_plugin.cpp
View File

@ -2033,16 +2033,19 @@ bool CanvasItemEditor::_gui_input_select(const Ref<InputEvent> &p_event) {
// Find the item to select // Find the item to select
CanvasItem *canvas_item = NULL; CanvasItem *canvas_item = NULL;
Vector<_SelectResult> selection;
// Retrieve the items
_get_canvas_items_at_pos(click, selection);
// Retrieve the bones // Retrieve the bones
Vector<_SelectResult> selection = Vector<_SelectResult>();
_get_bones_at_pos(click, selection); _get_bones_at_pos(click, selection);
if (!selection.empty()) { if (!selection.empty()) {
canvas_item = selection[0].item; 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) { if (!canvas_item) {