diff options
author | RĂ©mi Verschelde <rverschelde@gmail.com> | 2017-05-23 16:21:32 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-05-23 16:21:32 +0200 |
commit | 9e2b3f0903a74c009825561559d20bfc48062446 (patch) | |
tree | 28c60aa8216b3f56e292bd6339377d560c69d4a4 | |
parent | 016ee0edb55aa4fcb8b79b5b2b52764f65368c27 (diff) | |
parent | 86ef71fc95ff5d62ada42162b596172a57c78c91 (diff) |
Merge pull request #8880 from vnen/fix-canvas-item-editor-crash
Fix crash when interacting with the 2d editor
-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 2f1a4ce115..a626dffc3c 100644 --- a/editor/plugins/canvas_item_editor_plugin.cpp +++ b/editor/plugins/canvas_item_editor_plugin.cpp @@ -1531,8 +1531,8 @@ void CanvasItemEditor::_viewport_gui_input(const Ref<InputEvent> &p_event) { continue; } - bool uniform = b->get_shift(); - bool symmetric = b->get_alt(); + bool uniform = m->get_shift(); + bool symmetric = m->get_alt(); dto = dto - (drag == DRAG_ALL || drag == DRAG_NODE_2D ? drag_from - drag_point_from : Vector2(0, 0)); |