You've already forked godot
mirror of
https://github.com/godotengine/godot.git
synced 2025-11-07 12:30:27 +00:00
Fix build errors when building with disable_3d=yes
This commit is contained in:
@@ -1641,7 +1641,11 @@ void RuntimeNodeSelect::_physics_frame() {
|
|||||||
// Allow forcing box selection when an item was clicked.
|
// Allow forcing box selection when an item was clicked.
|
||||||
selection_drag_state = SELECTION_DRAG_MOVE;
|
selection_drag_state = SELECTION_DRAG_MOVE;
|
||||||
} else if (items.is_empty()) {
|
} else if (items.is_empty()) {
|
||||||
|
#ifdef _3D_DISABLED
|
||||||
|
if (!selected_ci_nodes.is_empty()) {
|
||||||
|
#else
|
||||||
if (!selected_ci_nodes.is_empty() || !selected_3d_nodes.is_empty()) {
|
if (!selected_ci_nodes.is_empty() || !selected_3d_nodes.is_empty()) {
|
||||||
|
#endif // _3D_DISABLED
|
||||||
EngineDebugger::get_singleton()->send_message("remote_nothing_clicked", Array());
|
EngineDebugger::get_singleton()->send_message("remote_nothing_clicked", Array());
|
||||||
_clear_selection();
|
_clear_selection();
|
||||||
}
|
}
|
||||||
@@ -1710,7 +1714,10 @@ void RuntimeNodeSelect::_send_ids(const Vector<Node *> &p_picked_nodes, bool p_i
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
const int limit = max_selection - (selected_ci_nodes.size() + selected_3d_nodes.size());
|
int limit = max_selection - selected_ci_nodes.size();
|
||||||
|
#ifndef _3D_DISABLED
|
||||||
|
limit -= selected_3d_nodes.size();
|
||||||
|
#endif // _3D_DISABLED
|
||||||
if (limit <= 0) {
|
if (limit <= 0) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -1848,9 +1855,15 @@ void RuntimeNodeSelect::_set_selected_nodes(const Vector<Node *> &p_nodes) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#ifdef _3D_DISABLED
|
||||||
|
if (!changed && nodes_ci.size() == selected_ci_nodes.size()) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
#else
|
||||||
if (!changed && nodes_ci.size() == selected_ci_nodes.size() && nodes_3d.size() == selected_3d_nodes.size()) {
|
if (!changed && nodes_ci.size() == selected_ci_nodes.size() && nodes_3d.size() == selected_3d_nodes.size()) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
#endif // _3D_DISABLED
|
||||||
|
|
||||||
_clear_selection();
|
_clear_selection();
|
||||||
selected_ci_nodes = nodes_ci;
|
selected_ci_nodes = nodes_ci;
|
||||||
|
|||||||
Reference in New Issue
Block a user