Stowage/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-10-31 05:31:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

Saner selection code for instanced scenes in 3D, should close #21447

Browse source 
Selecting instanced scenes still doesn't work properly because gizmos are not being added to instanced nodes.
I will probably work on fixing all the shenanigans around selection, but that will take some time.
This part of the code should work better for the moment.
This commit is contained in:
JFonS 2018-08-27 16:02:49 +02:00
parent 49cf675ef4
commit b58bb95c86
1 changed files with 9 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

21
editor/plugins/spatial_editor_plugin.cpp
View file

@ -307,7 +307,7 @@ ObjectID SpatialEditorViewport::_select_ray(const Point2 &p_pos, bool p_append,
Node *edited_scene = get_tree()->get_edited_scene_root();
ObjectID closest = 0;
Spatial *item = NULL;
Node *item = NULL;
float closest_dist = 1e20;
int selected_handle = -1;
@ -341,19 +341,16 @@ ObjectID SpatialEditorViewport::_select_ray(const Point2 &p_pos, bool p_append,
if (dist < closest_dist) {
//make sure that whathever is selected is editable
while (spat && spat != edited_scene && spat->get_owner() != edited_scene && !edited_scene->is_editable_instance(spat->get_owner())) {
spat = Object::cast_to<Spatial>(spat->get_owner());
}
if (spat) {
item = spat;
closest = spat->get_instance_id();
closest_dist = dist;
selected_handle = handle;
Node *owner = spat->get_owner();
if (owner != edited_scene && !edited_scene->is_editable_instance(owner)) {
item = owner;
} else {
ERR_PRINT("Bug?");
item = Object::cast_to<Node>(spat);
}
closest = item->get_instance_id();
closest_dist = dist;
selected_handle = handle;
}
}