From 10d7fccb549a743a867b92f12a6d64717c45ba86 Mon Sep 17 00:00:00 2001 From: Aaron Franke Date: Thu, 7 Jan 2021 22:37:37 -0500 Subject: Rename ButtonList enum and members to MouseButton --- editor/import/scene_import_settings.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'editor/import/scene_import_settings.cpp') diff --git a/editor/import/scene_import_settings.cpp b/editor/import/scene_import_settings.cpp index 5ae67f413a..48340ac242 100644 --- a/editor/import/scene_import_settings.cpp +++ b/editor/import/scene_import_settings.cpp @@ -668,21 +668,21 @@ void SceneImportSettings::_viewport_input(const Ref &p_input) { zoom = &md.cam_zoom; } Ref mm = p_input; - if (mm.is_valid() && mm->get_button_mask() & BUTTON_MASK_LEFT) { + if (mm.is_valid() && mm->get_button_mask() & MOUSE_BUTTON_MASK_LEFT) { (*rot_x) -= mm->get_relative().y * 0.01 * EDSCALE; (*rot_y) -= mm->get_relative().x * 0.01 * EDSCALE; (*rot_x) = CLAMP((*rot_x), -Math_PI / 2, Math_PI / 2); _update_camera(); } Ref mb = p_input; - if (mb.is_valid() && mb->get_button_index() == BUTTON_WHEEL_DOWN) { + if (mb.is_valid() && mb->get_button_index() == MOUSE_BUTTON_WHEEL_DOWN) { (*zoom) *= 1.1; if ((*zoom) > 10.0) { (*zoom) = 10.0; } _update_camera(); } - if (mb.is_valid() && mb->get_button_index() == BUTTON_WHEEL_UP) { + if (mb.is_valid() && mb->get_button_index() == MOUSE_BUTTON_WHEEL_UP) { (*zoom) /= 1.1; if ((*zoom) < 0.1) { (*zoom) = 0.1; -- cgit v1.2.3