asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #46451 from hilfazer/click_mesh_instance_crash

Browse source 
Prevent crash when clicking Mesh in MeshInstance when is scene root
This commit is contained in:
Rémi Verschelde 2021-02-26 20:59:19 +01:00 committed by GitHub
commit 9047e760d1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
editor/plugins/spatial_editor_plugin.cpp
View file

@ -532,7 +532,10 @@ ObjectID SpatialEditorViewport::_select_ray(const Point2 &p_pos, bool p_append,
continue; continue;
if (dist < closest_dist) { if (dist < closest_dist) {
item = edited_scene->get_deepest_editable_node(Object::cast_to<Node>(spat)); item = Object::cast_to<Node>(spat);
if (item != edited_scene) {
item = edited_scene->get_deepest_editable_node(item);
}
closest = item->get_instance_id(); closest = item->get_instance_id();
closest_dist = dist; closest_dist = dist;
@ -687,7 +690,10 @@ void SpatialEditorViewport::_select_region() {
if (!sp || _is_node_locked(sp)) if (!sp || _is_node_locked(sp))
continue; continue;
Node *item = edited_scene->get_deepest_editable_node(Object::cast_to<Node>(sp)); Node *item = Object::cast_to<Node>(sp);
if (item != edited_scene) {
item = edited_scene->get_deepest_editable_node(item);
}
// Replace the node by the group if grouped // Replace the node by the group if grouped
if (item->is_class("Spatial")) { if (item->is_class("Spatial")) {

2
scene/main/node.cpp
View file

@ -1929,7 +1929,7 @@ bool Node::is_editable_instance(const Node *p_node) const {
Node *Node::get_deepest_editable_node(Node *p_start_node) const { Node *Node::get_deepest_editable_node(Node *p_start_node) const {
ERR_FAIL_NULL_V(p_start_node, nullptr); ERR_FAIL_NULL_V(p_start_node, nullptr);
ERR_FAIL_COND_V(!is_a_parent_of(p_start_node), nullptr); ERR_FAIL_COND_V(!is_a_parent_of(p_start_node), p_start_node);
Node const *iterated_item = p_start_node; Node const *iterated_item = p_start_node;
Node *node = p_start_node; Node *node = p_start_node;