summaryrefslogtreecommitdiff
path: root/editor/plugins
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <rverschelde@gmail.com>2017-10-09 12:30:56 +0200
committerGitHub <noreply@github.com>2017-10-09 12:30:56 +0200
commit1cb4fc1510586d94b8b26801df7fe618628949af (patch)
tree86b81c639ecbceaaba3de4b909d5d9ea73dbde00 /editor/plugins
parent3091cfcebdb27fc4b1ae1809437c3b5b5d9a8f8e (diff)
parentf931093812b40b2c38f5b320c4b31ce7a7d30dd9 (diff)
Merge pull request #11846 from gabrielformiga/fix-ik-bone-drag
Fix IK Bone Drag on Viewport
Diffstat (limited to 'editor/plugins')
-rw-r--r--editor/plugins/canvas_item_editor_plugin.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/editor/plugins/canvas_item_editor_plugin.cpp b/editor/plugins/canvas_item_editor_plugin.cpp
index 3fc251d092..4b216d63f5 100644
--- a/editor/plugins/canvas_item_editor_plugin.cpp
+++ b/editor/plugins/canvas_item_editor_plugin.cpp
@@ -993,7 +993,7 @@ void CanvasItemEditor::_prepare_drag(const Point2 &p_click_pos) {
se->pre_drag_rect = canvas_item->get_item_rect();
}
- if (selection.size() == 1 && Object::cast_to<Node2D>(selection[0])) {
+ if (selection.size() == 1 && Object::cast_to<Node2D>(selection[0]) && bone_ik_list.size() == 0) {
drag = DRAG_NODE_2D;
drag_point_from = Object::cast_to<Node2D>(selection[0])->get_global_position();
} else {