diff options
Diffstat (limited to 'editor/plugins')
| -rw-r--r-- | editor/plugins/curve_editor_plugin.cpp | 2 | ||||
| -rw-r--r-- | editor/plugins/spatial_editor_plugin.cpp | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/editor/plugins/curve_editor_plugin.cpp b/editor/plugins/curve_editor_plugin.cpp index 5f50978693..da14c77fa9 100644 --- a/editor/plugins/curve_editor_plugin.cpp +++ b/editor/plugins/curve_editor_plugin.cpp @@ -775,7 +775,7 @@ CurveEditorPlugin::CurveEditorPlugin(EditorNode *p_node) { _toggle_button = _editor_node->add_bottom_panel_item(get_name(), _view); _toggle_button->hide(); - get_resource_previewer()->add_preview_generator(memnew(CurvePreviewGenerator)); + get_editor_interface()->get_resource_previewer()->add_preview_generator(memnew(CurvePreviewGenerator)); } CurveEditorPlugin::~CurveEditorPlugin() { diff --git a/editor/plugins/spatial_editor_plugin.cpp b/editor/plugins/spatial_editor_plugin.cpp index e2c8caae1f..607052231a 100644 --- a/editor/plugins/spatial_editor_plugin.cpp +++ b/editor/plugins/spatial_editor_plugin.cpp @@ -74,7 +74,9 @@ void SpatialEditorViewport::_update_camera(float p_interp_delta) { Transform old_transform = camera->get_global_transform(); Transform transform; - if (p_interp_delta && Input::get_singleton()->get_mouse_button_mask() == 0) { + bool disable_interp = (Input::get_singleton()->get_mouse_button_mask() & (2 | 4)) || Input::get_singleton()->is_key_pressed(KEY_SHIFT) || Input::get_singleton()->is_key_pressed(KEY_ALT) || Input::get_singleton()->is_key_pressed(KEY_CONTROL); + + if (p_interp_delta && !disable_interp) { //interpolate float interp_speed = 14; //maybe should be made configuration transform = old_transform.interpolate_with(new_transform, MIN(1.0, p_interp_delta * interp_speed)); |