Skip to content

Commit a9d46bb

Browse files
committed
Allow to select multiple remote nodes at runtime
1 parent f42e612 commit a9d46bb

22 files changed

+1433
-518
lines changed

core/math/math_fieldwise.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
2929
/**************************************************************************/
3030

31-
#ifdef TOOLS_ENABLED
31+
#ifdef DEBUG_ENABLED
3232

3333
#include "math_fieldwise.h"
3434

@@ -242,4 +242,4 @@ Variant fieldwise_assign(const Variant &p_target, const Variant &p_source, const
242242
/* clang-format on */
243243
}
244244

245-
#endif // TOOLS_ENABLED
245+
#endif // DEBUG_ENABLED

core/math/math_fieldwise.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,12 @@
3131
#ifndef MATH_FIELDWISE_H
3232
#define MATH_FIELDWISE_H
3333

34-
#ifdef TOOLS_ENABLED
34+
#ifdef DEBUG_ENABLED
3535

3636
#include "core/variant/variant.h"
3737

3838
Variant fieldwise_assign(const Variant &p_target, const Variant &p_source, const String &p_field);
3939

40-
#endif // TOOLS_ENABLED
40+
#endif // DEBUG_ENABLED
4141

4242
#endif // MATH_FIELDWISE_H

doc/classes/EditorSettings.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -191,6 +191,10 @@
191191
<member name="debugger/auto_switch_to_stack_trace" type="bool" setter="" getter="">
192192
If [code]true[/code], automatically switches to the [b]Stack Trace[/b] panel when the debugger hits a breakpoint or steps.
193193
</member>
194+
<member name="debugger/max_node_selection" type="int" setter="" getter="">
195+
The limit of how many remote nodes can be selected at once.
196+
[b]Warning:[/b] Increasing this value is not recommended, as selecting too many can make the editing and inspection of remote properties unreliable.
197+
</member>
194198
<member name="debugger/profile_native_calls" type="bool" setter="" getter="">
195199
If [code]true[/code], enables collection of profiling data from non-GDScript Godot functions, such as engine class methods. Enabling this slows execution while profiling further.
196200
</member>

editor/debugger/debug_adapter/debug_adapter_protocol.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -843,7 +843,9 @@ bool DebugAdapterProtocol::request_remote_object(const ObjectID &p_object_id) {
843843
return false;
844844
}
845845

846-
EditorDebuggerNode::get_singleton()->get_default_debugger()->request_remote_object(p_object_id);
846+
TypedArray<uint64_t> arr;
847+
arr.append(p_object_id);
848+
EditorDebuggerNode::get_singleton()->get_default_debugger()->request_remote_objects(arr);
847849
object_pending_set.insert(p_object_id);
848850

849851
return true;

0 commit comments

Comments
 (0)