Skip to content

Commit 05db2e8

Browse files
committed
Merge pull request #104143 from syntaxerror247/Fix-build-issue
Fix build errors when building with `disable_3d=yes`
2 parents c738ac8 + 7a5267d commit 05db2e8

File tree

1 file changed

+14
-1
lines changed

1 file changed

+14
-1
lines changed

scene/debugger/scene_debugger.cpp

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1641,7 +1641,11 @@ void RuntimeNodeSelect::_physics_frame() {
16411641
// Allow forcing box selection when an item was clicked.
16421642
selection_drag_state = SELECTION_DRAG_MOVE;
16431643
} else if (items.is_empty()) {
1644+
#ifdef _3D_DISABLED
1645+
if (!selected_ci_nodes.is_empty()) {
1646+
#else
16441647
if (!selected_ci_nodes.is_empty() || !selected_3d_nodes.is_empty()) {
1648+
#endif // _3D_DISABLED
16451649
EngineDebugger::get_singleton()->send_message("remote_nothing_clicked", Array());
16461650
_clear_selection();
16471651
}
@@ -1710,7 +1714,10 @@ void RuntimeNodeSelect::_send_ids(const Vector<Node *> &p_picked_nodes, bool p_i
17101714
return;
17111715
}
17121716

1713-
const int limit = max_selection - (selected_ci_nodes.size() + selected_3d_nodes.size());
1717+
int limit = max_selection - selected_ci_nodes.size();
1718+
#ifndef _3D_DISABLED
1719+
limit -= selected_3d_nodes.size();
1720+
#endif // _3D_DISABLED
17141721
if (limit <= 0) {
17151722
return;
17161723
}
@@ -1848,9 +1855,15 @@ void RuntimeNodeSelect::_set_selected_nodes(const Vector<Node *> &p_nodes) {
18481855
}
18491856
}
18501857

1858+
#ifdef _3D_DISABLED
1859+
if (!changed && nodes_ci.size() == selected_ci_nodes.size()) {
1860+
return;
1861+
}
1862+
#else
18511863
if (!changed && nodes_ci.size() == selected_ci_nodes.size() && nodes_3d.size() == selected_3d_nodes.size()) {
18521864
return;
18531865
}
1866+
#endif // _3D_DISABLED
18541867

18551868
_clear_selection();
18561869
selected_ci_nodes = nodes_ci;

0 commit comments

Comments
 (0)