summaryrefslogtreecommitdiffstats
path: root/editor/plugins/canvas_item_editor_plugin.cpp
diff options
context:
space:
mode:
authorqarmin <mikrutrafal54@gmail.com>2019-10-14 11:40:55 +0200
committerqarmin <mikrutrafal54@gmail.com>2019-10-14 11:40:55 +0200
commit616ab4fac200170bc0d2ba1958e424fd309fc494 (patch)
treeb39dcd6dfe36cc5c99ce7f8790631ac242b1217e /editor/plugins/canvas_item_editor_plugin.cpp
parent1fed266bf5452b30376db62495f4985f6975f2c1 (diff)
downloadredot-engine-616ab4fac200170bc0d2ba1958e424fd309fc494.tar.gz
Small fixes to redundand code, copy paste bugs
Diffstat (limited to 'editor/plugins/canvas_item_editor_plugin.cpp')
-rw-r--r--editor/plugins/canvas_item_editor_plugin.cpp4
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 117b88bc7e..2a31d53a7e 100644
--- a/editor/plugins/canvas_item_editor_plugin.cpp
+++ b/editor/plugins/canvas_item_editor_plugin.cpp
@@ -1197,7 +1197,7 @@ bool CanvasItemEditor::_gui_input_zoom_or_pan(const Ref<InputEvent> &p_event, bo
//Pan the viewport
panning = true;
}
- } else if (panning) {
+ } else {
if (!k->is_pressed()) {
// Stop panning the viewport (for any mouse button press)
panning = false;
@@ -4894,7 +4894,7 @@ void CanvasItemEditor::set_state(const Dictionary &p_state) {
if (state.has("grid_snap_active")) {
grid_snap_active = state["grid_snap_active"];
- grid_snap_button->set_pressed(smart_snap_active);
+ grid_snap_button->set_pressed(grid_snap_active);
}
if (state.has("snap_node_parent")) {