summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormarynate <mary.w.nate@gmail.com>2014-03-31 16:27:41 +0800
committermarynate <mary.w.nate@gmail.com>2014-04-01 00:52:47 +0800
commit4dbf26cba26811878cafff6b54ec91cece792b92 (patch)
treefc3f4c299e72f6e3071ab8653be583b7115dd949
parent35bf23859a145989ef79c8cfac20d8c8eefe371c (diff)
Keep selection from been cleared when navigating in 3d viewport
Conflicts: tools/editor/plugins/spatial_editor_plugin.cpp
-rw-r--r--tools/editor/plugins/spatial_editor_plugin.cpp5
1 files changed, 5 insertions, 0 deletions
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;