[Bf-blender-cvs] [bdd34f4fa25] master: Fix T103051: Changed behavior when removing a material slot

Hans Goudey noreply at git.blender.org
Tue Dec 13 22:18:27 CET 2022


Commit: bdd34f4fa25c7382bac452db82af639bab453046
Author: Hans Goudey
Date:   Tue Dec 13 13:36:48 2022 -0600
Branches: master
https://developer.blender.org/rBbdd34f4fa25c7382bac452db82af639bab453046

Fix T103051: Changed behavior when removing a material slot

Before f1c0249f34c4171ec311 the material was assigned to the previous
slot rather than the next. Though the behavior is arbitrary, there
is no reason to change it.

===================================================================

M	source/blender/blenkernel/intern/mesh.cc

===================================================================

diff --git a/source/blender/blenkernel/intern/mesh.cc b/source/blender/blenkernel/intern/mesh.cc
index 1fafec810ba..1fd2a72f311 100644
--- a/source/blender/blenkernel/intern/mesh.cc
+++ b/source/blender/blenkernel/intern/mesh.cc
@@ -1363,7 +1363,7 @@ void BKE_mesh_material_index_remove(Mesh *me, short index)
   }
   MutableVArraySpan<int> indices_span(material_indices.varray);
   for (const int i : indices_span.index_range()) {
-    if (indices_span[i] > 0 && indices_span[i] > index) {
+    if (indices_span[i] > 0 && indices_span[i] >= index) {
       indices_span[i]--;
     }
   }



More information about the Bf-blender-cvs mailing list