godotengine
/
godot
mirror of https://github.com/godotengine/godot
1
0
Fork 0
Code

Fix 3D editor Emulate Numpad setting having no effect when previewing a camera

This commit is contained in:
Hugo Locurcio 2024-06-29 02:24:10 +02:00
parent 79603b2f28
commit c92ad80ec0
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
editor/scene/3d/node_3d_editor_plugin.cpp
View File

@ -1810,8 +1810,18 @@ void Node3DEditorViewport::input(const Ref<InputEvent> &p_event) {
}
void Node3DEditorViewport::_sinput(const Ref<InputEvent> &p_event) {
const Ref<InputEventKey> k = p_event;
if (k.is_valid() && k->is_pressed() && EDITOR_GET("editors/3d/navigation/emulate_numpad")) {
const Key code = k->get_physical_keycode();
if (code >= Key::KEY_0 && code <= Key::KEY_9) {
k->set_keycode(code - Key::KEY_0 + Key::KP_0);
}
}
if (previewing || get_viewport()->gui_get_drag_data()) {
return; //do NONE
// Disable all input actions when previewing a camera or during drag-and-drop.
return;
}
if (_redirect_freelook_input(p_event, this)) {
@ -2464,8 +2474,6 @@ void Node3DEditorViewport::_sinput(const Ref<InputEvent> &p_event) {
}
}
Ref<InputEventKey> k = p_event;
if (k.is_valid()) {
if (!k->is_pressed()) {
return;