godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix for snap to floor editor crash bug

Browse Source 
fix for issue #44231: snap_selected_nodes_to_floor() results in an editor
crash when a child collisionshape has invalid shape object

(cherry picked from commit 52f6e0b5ad)
This commit is contained in:
jeffuntildeath 2020-12-09 11:40:30 -06:00 committed by Rémi Verschelde
parent 979e5b36da
commit de7b5006cc
No known key found for this signature in database
GPG Key ID: C3336907360768E1
1 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
editor/plugins/spatial_editor_plugin.cpp
View File

@ -5803,13 +5803,25 @@ void SpatialEditor::snap_selected_nodes_to_floor() {
Set<CollisionShape *> cs = _get_child_nodes<CollisionShape>(sp); Set<CollisionShape *> cs = _get_child_nodes<CollisionShape>(sp);
if (cs.size()) { if (cs.size()) {
AABB aabb = sp->get_global_transform().xform(cs.front()->get()->get_shape()->get_debug_mesh()->get_aabb()); AABB aabb;
for (Set<CollisionShape *>::Element *I = cs.front(); I; I = I->next()) { bool found_valid_shape = false;
aabb.merge_with(sp->get_global_transform().xform(I->get()->get_shape()->get_debug_mesh()->get_aabb())); if (cs.front()->get()->get_shape().is_valid()) {
aabb = sp->get_global_transform().xform(cs.front()->get()->get_shape()->get_debug_mesh()->get_aabb());
found_valid_shape = true;
}
for (Set<CollisionShape *>::Element *I = cs.front(); I; I = I->next()) {
if (I->get()->get_shape().is_valid()) {
aabb.merge_with(sp->get_global_transform().xform(I->get()->get_shape()->get_debug_mesh()->get_aabb()));
found_valid_shape = true;
}
}
if (found_valid_shape) {
Vector3 size = aabb.size * Vector3(0.5, 0.0, 0.5);
from = aabb.position + size;
position_offset.y = from.y - sp->get_global_transform().origin.y;
} else {
from = sp->get_global_transform().origin;
} }
Vector3 size = aabb.size * Vector3(0.5, 0.0, 0.5);
from = aabb.position + size;
position_offset.y = from.y - sp->get_global_transform().origin.y;
} else if (vi.size()) { } else if (vi.size()) {
AABB aabb = vi.front()->get()->get_transformed_aabb(); AABB aabb = vi.front()->get()->get_transformed_aabb();
for (Set<VisualInstance *>::Element *I = vi.front(); I; I = I->next()) { for (Set<VisualInstance *>::Element *I = vi.front(); I; I = I->next()) {