Merge branch 'blender-v4.3-release'

2024-10-07 13:40:00 -07:00
parent 207150affe bacbed14d0
commit 66697cb81e
1 changed files with 5 additions and 0 deletions
--- a/source/blender/editors/sculpt_paint/sculpt_filter_mesh.cc
+++ b/source/blender/editors/sculpt_paint/sculpt_filter_mesh.cc
@@ -2397,6 +2397,11 @@ static int sculpt_mesh_filter_start(bContext *C, wmOperator *op)

  SculptSession &ss = *ob.sculpt;

+  const bke::pbvh::Tree &pbvh = *bke::object::pbvh_get(ob);
+  if (filter_type == MeshFilterType::EraseDispacement && pbvh.type() != bke::pbvh::Type::Grids) {
+    return OPERATOR_CANCELLED;
+  }
+
  const eMeshFilterDeformAxis deform_axis = eMeshFilterDeformAxis(
      RNA_enum_get(op->ptr, "deform_axis"));