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@0c51ede243

Browse Source
This commit is contained in:
Spartan322
2025-08-16 23:07:50 -04:00
parent d80960263a 0c51ede243
commit 7aeecacb93
90 changed files with 1009 additions and 230 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
scene/debugger/scene_debugger.cpp
View File

@@ -1924,18 +1924,6 @@ void RuntimeNodeSelect::_send_ids(const Vector<Node *> &p_picked_nodes, bool p_i
return;
}
int limit = max_selection - selected_ci_nodes.size();
#ifndef _3D_DISABLED
limit -= selected_3d_nodes.size();
#endif // _3D_DISABLED
if (limit <= 0) {
return;
}
if (picked_nodes.size() > limit) {
picked_nodes.resize(limit);
EngineDebugger::get_singleton()->send_message("show_selection_limit_warning", Array());
}
LocalVector<Node *> nodes;
LocalVector<ObjectID> ids;
for (Node *node : picked_nodes) {
@@ -1965,6 +1953,16 @@ void RuntimeNodeSelect::_send_ids(const Vector<Node *> &p_picked_nodes, bool p_i
}
}
uint32_t limit = max_selection - selected_ci_nodes.size();
#ifndef _3D_DISABLED
limit -= selected_3d_nodes.size();
#endif // _3D_DISABLED
if (ids.size() > limit) {
ids.resize(limit);
nodes.resize(limit);
EngineDebugger::get_singleton()->send_message("show_selection_limit_warning", Array());
}
for (ObjectID id : selected_ci_nodes) {
ids.push_back(id);
nodes.push_back(ObjectDB::get_instance<Node>(id));
@@ -1976,11 +1974,6 @@ void RuntimeNodeSelect::_send_ids(const Vector<Node *> &p_picked_nodes, bool p_i
}
#endif // _3D_DISABLED
if (ids.size() > (unsigned)max_selection) {
ids.resize(max_selection);
EngineDebugger::get_singleton()->send_message("show_selection_limit_warning", Array());
}
if (ids.is_empty()) {
EngineDebugger::get_singleton()->send_message("remote_nothing_selected", message);
} else {