diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-11-12 23:39:17 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-12 23:39:17 +0100 |
| commit | 5aae92f069b47c040d93e5edba2aad5b104fd1a5 (patch) | |
| tree | e6d222c6488c1e4f1a9e4ffa68c1404473a00843 /editor/property_editor.cpp | |
| parent | 4f85cad013c5469a39287e9aa474735f950e302c (diff) | |
| parent | 3c0fdcc8acfadb124fbfa914532868948561c351 (diff) | |
Merge pull request #51684 from aaronfranke/enum-class
Diffstat (limited to 'editor/property_editor.cpp')
| -rw-r--r-- | editor/property_editor.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/editor/property_editor.cpp b/editor/property_editor.cpp index 62c5cc5cc1..f10ecab34e 100644 --- a/editor/property_editor.cpp +++ b/editor/property_editor.cpp @@ -1343,7 +1343,7 @@ void CustomPropertyEditor::_action_pressed(int p_which) { void CustomPropertyEditor::_drag_easing(const Ref<InputEvent> &p_ev) { Ref<InputEventMouseMotion> mm = p_ev; - if (mm.is_valid() && mm->get_button_mask() & MOUSE_BUTTON_MASK_LEFT) { + if (mm.is_valid() && (mm->get_button_mask() & MouseButton::MASK_LEFT) != MouseButton::NONE) { float rel = mm->get_relative().x; if (rel == 0) { return; @@ -1628,7 +1628,7 @@ real_t CustomPropertyEditor::_parse_real_expression(String text) { } void CustomPropertyEditor::_emit_changed_whole_or_field() { - if (!Input::get_singleton()->is_key_pressed(KEY_SHIFT)) { + if (!Input::get_singleton()->is_key_pressed(Key::SHIFT)) { emit_signal(SNAME("variant_changed")); } else { emit_signal(SNAME("variant_field_changed"), field_names[focused_value_editor]); |