Skip to content

Commit

Permalink
Merge pull request godotengine#86699 from MajorMcDoom/editor-csg-coll…
Browse files Browse the repository at this point in the history
…ision-gizmo-fix

Fix `CSGShape3D` debug collision shapes being visible in editor
  • Loading branch information
akien-mga committed Sep 10, 2024
2 parents 27552a2 + a9e51c3 commit 91c66b5
Showing 1 changed file with 1 addition and 6 deletions.
7 changes: 1 addition & 6 deletions modules/csg/csg_shape.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -513,7 +513,7 @@ Ref<ConcavePolygonShape3D> CSGShape3D::bake_collision_shape() {
}

bool CSGShape3D::_is_debug_collision_shape_visible() {
return is_inside_tree() && (get_tree()->is_debugging_collisions_hint() || Engine::get_singleton()->is_editor_hint());
return !Engine::get_singleton()->is_editor_hint() && is_inside_tree() && get_tree()->is_debugging_collisions_hint();
}

void CSGShape3D::_update_debug_collision_shape() {
Expand Down Expand Up @@ -604,11 +604,6 @@ void CSGShape3D::_notification(int p_what) {
// Update this node's parent only if its own visibility has changed, not the visibility of parent nodes
parent_shape->_make_dirty();
}
if (is_visible()) {
_update_debug_collision_shape();
} else {
_clear_debug_collision_shape();
}
last_visible = is_visible();
} break;

Expand Down

0 comments on commit 91c66b5

Please sign in to comment.