Sara/behaviour-tree-test
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

Merge pull request #28295 from zqyoung1/fix-gridmap-nav-schemes

Browse source 
Fixed navigation schemes Modo/Maya when used with grid map tile place…
This commit is contained in:
Rémi Verschelde 2019-06-19 19:30:57 +02:00 • committed by GitHub
commit 1abfd61f6e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

12
editor/plugins/spatial_editor_plugin.h
View file

@ -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

6
modules/gridmap/grid_map_editor_plugin.cpp
View file

@ -664,8 +664,10 @@ bool GridMapEditor::forward_spatial_input_event(Camera *p_camera, const Ref<Inpu
}
if (mb->is_pressed()) {
if (mb->get_button_index() == BUTTON_LEFT) {
SpatialEditorViewport::NavigationScheme nav_scheme = (SpatialEditorViewport::NavigationScheme)EditorSettings::get_singleton()->get("editors/3d/navigation/navigation_scheme").operator int();
if ((nav_scheme == SpatialEditorViewport::NAVIGATION_MAYA || nav_scheme == SpatialEditorViewport::NAVIGATION_MODO) && mb->get_alt()) {
input_action = INPUT_NONE;
} else if (mb->get_button_index() == BUTTON_LEFT) {
if (input_action == INPUT_PASTE) {
_do_paste();