diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2022-01-23 16:03:35 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-23 16:03:35 +0100 |
| commit | a673e18d348ac863b2f5af1e25e557759dea56a9 (patch) | |
| tree | 9a02bccbae4ef082325801a6a4264e94f93fa7a6 /editor/plugins/texture_region_editor_plugin.cpp | |
| parent | c3d28ffa742298d7e00d0a08251ae97870e3ad88 (diff) | |
| parent | 98692d68c3e7f3cc2a4697edfc827703b5018c36 (diff) | |
Merge pull request #57080 from KoBeWi/ULTIMATER_PANNING
Diffstat (limited to 'editor/plugins/texture_region_editor_plugin.cpp')
| -rw-r--r-- | editor/plugins/texture_region_editor_plugin.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/editor/plugins/texture_region_editor_plugin.cpp b/editor/plugins/texture_region_editor_plugin.cpp index d0c9767a1d..662c0126ec 100644 --- a/editor/plugins/texture_region_editor_plugin.cpp +++ b/editor/plugins/texture_region_editor_plugin.cpp @@ -602,7 +602,7 @@ void TextureRegionEditor::_region_input(const Ref<InputEvent> &p_input) { } } -void TextureRegionEditor::_scroll_callback(Vector2 p_scroll_vec) { +void TextureRegionEditor::_scroll_callback(Vector2 p_scroll_vec, bool p_alt) { _pan_callback(-p_scroll_vec * 32); } @@ -820,7 +820,7 @@ void TextureRegionEditor::_notification(int p_what) { [[fallthrough]]; } case EditorSettings::NOTIFICATION_EDITOR_SETTINGS_CHANGED: { - panner->setup((ViewPanner::ControlScheme)EDITOR_GET("editors/panning/sub_editor_panning_scheme").operator int(), ED_GET_SHORTCUT("canvas_item_editor/pan_view"), bool(EditorSettings::get_singleton()->get("editors/panning/simple_panning"))); + panner->setup((ViewPanner::ControlScheme)EDITOR_GET("editors/panning/sub_editors_panning_scheme").operator int(), ED_GET_SHORTCUT("canvas_item_editor/pan_view"), bool(EditorSettings::get_singleton()->get("editors/panning/simple_panning"))); } break; case NOTIFICATION_VISIBILITY_CHANGED: { if (snap_mode == SNAP_AUTOSLICE && is_visible() && autoslice_is_dirty) { |