Merge branch 'blender-v4.1-release'

2024-03-07 15:46:04 +01:00
parent 35a5518379 5d1d447c2b
commit 77168d960a
1 changed files with 1 additions and 1 deletions
@@ -1256,7 +1256,7 @@ void BKE_object_material_array_assign(

  /* now we have the right number of slots */
  for (int i = 0; i < totcol; i++) {
-    if (to_object_only && ob->matbits[i] == 0) {
+    if (to_object_only && ob->matbits && ob->matbits[i] == 0) {
      /* If we only assign to object, and that slot uses obdata material, do nothing. */
      continue;
    }