godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-09 12:50:35 +00:00
Code Releases Wiki Activity

Merge pull request #49725 from EricEzaM/multi-node-picking-fixes

Browse Source 
Fixes for multi-node editing interactions.
This commit is contained in:
Rémi Verschelde
2021-07-12 19:23:13 +02:00
committed by GitHub
parent b218c6785e 83cb48e69e
commit 3c0c202bf6
3 changed files with 31 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
editor/plugins/node_3d_editor_plugin.cpp
View File

@@ -467,22 +467,31 @@ void Node3DEditorViewport::_select_clicked(bool p_append, bool p_single, bool p_
}
void Node3DEditorViewport::_select(Node *p_node, bool p_append, bool p_single) {
if (!p_append) {
editor_selection->clear();
}
if (editor_selection->is_selected(p_node)) {
//erase
editor_selection->remove_node(p_node);
} else {
// Add or remove a single node from the selection
if (p_append && p_single) {
if (editor_selection->is_selected(p_node)) {
// Already in the selection, remove it from the selected nodes
editor_selection->remove_node(p_node);
} else {
// Add the item to the selection
editor_selection->add_node(p_node);
}
} else if (p_append && !p_single) {
// Add the item to the selection
editor_selection->add_node(p_node);
}
if (p_single) {
} else {
// No append; single select
editor_selection->clear();
editor_selection->add_node(p_node);
// Reselect
if (Engine::get_singleton()->is_editor_hint()) {
editor->call("edit_node", p_node);
}
}
if (editor_selection->get_selected_node_list().size() == 1) {
editor->push_item(editor_selection->get_selected_node_list()[0]);
}
}
ObjectID Node3DEditorViewport::_select_ray(const Point2 &p_pos, bool p_append, bool &r_includes_current, int *r_gizmo_handle, bool p_alt_select) {