summaryrefslogtreecommitdiff
path: root/editor
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2019-06-19 19:30:57 +0200
committerGitHub <noreply@github.com>2019-06-19 19:30:57 +0200
commit1abfd61f6ea125032d277d90b004841b877be3b7 (patch)
tree741a3720bde047139922847ce6015545772c4729 /editor
parentd8477c0596b2ce6669c92e2f4581a9a7aaf92798 (diff)
parent7b1e112f1ddecfa8c7558d2958bc7ad44ad28c56 (diff)
Merge pull request #28295 from zqyoung1/fix-gridmap-nav-schemes
Fixed navigation schemes Modo/Maya when used with grid map tile place…
Diffstat (limited to 'editor')
-rw-r--r--editor/plugins/spatial_editor_plugin.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/editor/plugins/spatial_editor_plugin.h b/editor/plugins/spatial_editor_plugin.h
index f3a1e657cc..ebaa930eb0 100644
--- a/editor/plugins/spatial_editor_plugin.h
+++ b/editor/plugins/spatial_editor_plugin.h
@@ -178,6 +178,12 @@ public:
GIZMO_GRID_LAYER = 25
};
+ enum NavigationScheme {
+ NAVIGATION_GODOT,
+ NAVIGATION_MAYA,
+ NAVIGATION_MODO,
+ };
+
private:
int index;
String name;
@@ -260,12 +266,6 @@ private:
PopupMenu *selection_menu;
- enum NavigationScheme {
- NAVIGATION_GODOT,
- NAVIGATION_MAYA,
- NAVIGATION_MODO,
- };
-
enum NavigationZoomStyle {
NAVIGATION_ZOOM_VERTICAL,
NAVIGATION_ZOOM_HORIZONTAL