diff options
| author | Pedro J. Estébanez | 2017-04-20 15:43:09 +0200 |
|---|---|---|
| committer | Pedro J. Estébanez | 2017-04-20 16:18:47 +0200 |
| commit | f5be049dd87ab7cfbd89292a86dd1139d6a78624 (patch) | |
| tree | 1cbbbdc88feeac9afa337f73cb8e72169322274d /editor/plugins/canvas_item_editor_plugin.cpp | |
| parent | 8df5b7151f9682e851b6c1c9ff1e13a32190b532 (diff) | |
| download | godot-f5be049dd87ab7cfbd89292a86dd1139d6a78624.tar.gz godot-f5be049dd87ab7cfbd89292a86dd1139d6a78624.tar.zst godot-f5be049dd87ab7cfbd89292a86dd1139d6a78624.zip | |
Fix IK not being solved while dragging a bone
Diffstat (limited to 'editor/plugins/canvas_item_editor_plugin.cpp')
| -rw-r--r-- | editor/plugins/canvas_item_editor_plugin.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/editor/plugins/canvas_item_editor_plugin.cpp b/editor/plugins/canvas_item_editor_plugin.cpp index 59abf1557..638d54a2d 100644 --- a/editor/plugins/canvas_item_editor_plugin.cpp +++ b/editor/plugins/canvas_item_editor_plugin.cpp @@ -834,7 +834,7 @@ void CanvasItemEditor::_prepare_drag(const Point2 &p_click_pos) { se->undo_pivot = canvas_item->cast_to<Node2D>()->edit_get_pivot(); } - if (selection.size() == 1 && selection[0]->cast_to<Node2D>()) { + if (selection.size() == 1 && selection[0]->cast_to<Node2D>() && bone_ik_list.size() == 0) { drag = DRAG_NODE_2D; drag_point_from = selection[0]->cast_to<Node2D>()->get_global_pos(); } else { @@ -1360,7 +1360,7 @@ void CanvasItemEditor::_viewport_input_event(const InputEvent &p_event) { } } - if (drag != DRAG_NONE && (!Cbone || drag != DRAG_ALL)) { + if (drag != DRAG_NONE && (!Cbone || (drag != DRAG_ALL && drag != DRAG_NODE_2D))) { drag_from = transform.affine_inverse().xform(click); se->undo_state = canvas_item->edit_get_state(); if (canvas_item->cast_to<Node2D>()) |