From 4dbf26cba26811878cafff6b54ec91cece792b92 Mon Sep 17 00:00:00 2001 From: marynate Date: Mon, 31 Mar 2014 16:27:41 +0800 Subject: Keep selection from been cleared when navigating in 3d viewport Conflicts: tools/editor/plugins/spatial_editor_plugin.cpp --- tools/editor/plugins/spatial_editor_plugin.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tools/editor/plugins/spatial_editor_plugin.cpp b/tools/editor/plugins/spatial_editor_plugin.cpp index 5c019d9f20..9bd9a5cff0 100644 --- a/tools/editor/plugins/spatial_editor_plugin.cpp +++ b/tools/editor/plugins/spatial_editor_plugin.cpp @@ -844,6 +844,11 @@ void SpatialEditorViewport::_sinput(const InputEvent &p_event) { if (b.pressed) { + NavigationScheme nav_scheme = _get_navigation_schema("3d_editor/navigation_scheme"); + if ( (nav_scheme==NAVIGATION_MAYA || nav_scheme==NAVIGATION_MODO) && b.mod.alt) { + break; + } + _edit.mouse_pos=Point2(b.x,b.y); _edit.snap=false; _edit.mode=TRANSFORM_NONE; -- cgit v1.2.3