Merge branch 'blender-v3.5-release'

Conflicts: source/blender/modifiers/intern/MOD_array.cc
2023-03-09 16:53:06 +01:00
parent e699bd780c 8b2556e8d8
commit a8819481cb
3 changed files with 25 additions and 7 deletions
--- a/source/blender/modifiers/intern/MOD_array.cc
+++ b/source/blender/modifiers/intern/MOD_array.cc
@@ -372,8 +372,12 @@ static void mesh_merge_transform(Mesh *result,

 static Mesh *arrayModifier_doArray(ArrayModifierData *amd,
                                   const ModifierEvalContext *ctx,
-                                   const Mesh *mesh)
+                                   Mesh *mesh)
 {
+  if (mesh->totvert == 0) {
+    return mesh;
+  }
+
  MEdge *edge;
  MLoop *ml;
  int i, j, c, count;