Andrew/redot-engine
1
0
Fork 0
mirror of https://github.com/Redot-Engine/redot-engine.git synced 2025-12-06 07:17:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit godotengine/godot@75ce4266c4

Browse Source
This commit is contained in:
Spartan322
2024-12-29 08:01:17 -05:00
parent 20b6554f03 75ce4266c4
commit 1609981ccf
595 changed files with 2526 additions and 2033 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
scene/debugger/scene_debugger.cpp
View File

@@ -1252,9 +1252,8 @@ void RuntimeNodeSelect::_setup(const Dictionary &p_settings) {
int pan_speed = p_settings.get("editors/panning/2d_editor_pan_speed", 20);
Array keys = p_settings.get("canvas_item_editor/pan_view", Array()).operator Array();
panner->setup(panning_scheme, DebuggerMarshalls::deserialize_key_shortcut(keys), simple_panning);
panner->set_viewport(root);
panner->setup_warped_panning(root, p_settings.get("editors/panning/warped_mouse_panning", true));
panner->set_scroll_speed(pan_speed);
warped_panning = p_settings.get("editors/panning/warped_mouse_panning", false);
/// 2D Selection Box Generation
@@ -1365,7 +1364,7 @@ void RuntimeNodeSelect::_root_window_input(const Ref<InputEvent> &p_event) {
if (camera_override) {
if (node_select_type == NODE_TYPE_2D) {
if (panner->gui_input(p_event, warped_panning ? Rect2(Vector2(), root->get_size()) : Rect2())) {
if (panner->gui_input(p_event, Rect2(Vector2(), root->get_size()))) {
return;
}
} else if (node_select_type == NODE_TYPE_3D) {