diff options
| author | Juan Linietsky | 2017-01-14 22:20:05 -0300 |
|---|---|---|
| committer | Juan Linietsky | 2017-01-15 09:50:27 -0300 |
| commit | a7854d3ae6a81093b1cf23da3dd99b57b1aebc34 (patch) | |
| tree | f9803ca74f71b6725dc7c0c82d7d0c43318f777e /tools/editor/plugins/spatial_editor_plugin.cpp | |
| parent | 5e13a762ecbdfe6a643977b74c790d479a0636e2 (diff) | |
| download | godot-a7854d3ae6a81093b1cf23da3dd99b57b1aebc34.tar.gz godot-a7854d3ae6a81093b1cf23da3dd99b57b1aebc34.tar.zst godot-a7854d3ae6a81093b1cf23da3dd99b57b1aebc34.zip | |
2D and 3D viewport are working again :D
Diffstat (limited to '')
| -rw-r--r-- | tools/editor/plugins/spatial_editor_plugin.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/tools/editor/plugins/spatial_editor_plugin.cpp b/tools/editor/plugins/spatial_editor_plugin.cpp index 97bc5a25e..81db5d5fb 100644 --- a/tools/editor/plugins/spatial_editor_plugin.cpp +++ b/tools/editor/plugins/spatial_editor_plugin.cpp @@ -1527,11 +1527,11 @@ void SpatialEditorViewport::_sinput(const InputEvent &p_event) { if (m.mod.meta) mod=KEY_META; - if (mod == _get_key_modifier("3d_editor/pan_modifier")) + if (mod == _get_key_modifier("editors/3d/pan_modifier")) nav_mode = NAVIGATION_PAN; - else if (mod == _get_key_modifier("3d_editor/zoom_modifier")) + else if (mod == _get_key_modifier("editors/3d/zoom_modifier")) nav_mode = NAVIGATION_ZOOM; - else if (mod == _get_key_modifier("3d_editor/orbit_modifier")) + else if (mod == _get_key_modifier("editors/3d/orbit_modifier")) nav_mode = NAVIGATION_ORBIT; } else if (nav_scheme == NAVIGATION_MAYA) { @@ -1552,11 +1552,11 @@ void SpatialEditorViewport::_sinput(const InputEvent &p_event) { mod=KEY_META; if(mod){ - if (mod == _get_key_modifier("3d_editor/pan_modifier")) + if (mod == _get_key_modifier("editors/3d/pan_modifier")) nav_mode = NAVIGATION_PAN; - else if (mod == _get_key_modifier("3d_editor/zoom_modifier")) + else if (mod == _get_key_modifier("editors/3d/zoom_modifier")) nav_mode = NAVIGATION_ZOOM; - else if (mod == _get_key_modifier("3d_editor/orbit_modifier")) + else if (mod == _get_key_modifier("editors/3d/orbit_modifier")) nav_mode = NAVIGATION_ORBIT; } } @@ -1587,7 +1587,7 @@ void SpatialEditorViewport::_sinput(const InputEvent &p_event) { if (nav_scheme==NAVIGATION_MAYA && m.mod.shift) zoom_speed *= zoom_speed_modifier; - NavigationZoomStyle zoom_style = (NavigationZoomStyle)EditorSettings::get_singleton()->get("3d_editor/zoom_style").operator int(); + NavigationZoomStyle zoom_style = (NavigationZoomStyle)EditorSettings::get_singleton()->get("editors/3d/zoom_style").operator int(); if (zoom_style == NAVIGATION_ZOOM_HORIZONTAL) { if ( m.relative_x > 0) cursor.distance*=1-m.relative_x*zoom_speed; @@ -4095,7 +4095,7 @@ SpatialEditor::SpatialEditor(EditorNode *p_editor) { add_to_group("_spatial_editor_group"); EDITOR_DEF("editors/3d/manipulator_gizmo_size",80); - EditorSettings::get_singleton()->add_property_hint(PropertyInfo(Variant::INT,"3d_editor/manipulator_gizmo_size",PROPERTY_HINT_RANGE,"16,1024,1")); + EditorSettings::get_singleton()->add_property_hint(PropertyInfo(Variant::INT,"editors/3d/manipulator_gizmo_size",PROPERTY_HINT_RANGE,"16,1024,1")); EDITOR_DEF("editors/3d/manipulator_gizmo_opacity",0.2); over_gizmo_handle=-1; |