[Bf-blender-cvs] [2156e0c0f1e] refactor-mesh-material-index-generic: Fix last use of deprecated material index struct member

[Hans Goudey]

Commit: 2156e0c0f1ecbfd120ef9fca98195459d082e069
Author: Hans Goudey
Date:   Fri Aug 26 23:57:14 2022 -0500
Branches: refactor-mesh-material-index-generic
https://developer.blender.org/rB2156e0c0f1ecbfd120ef9fca98195459d082e069

Fix last use of deprecated material index struct member

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

M	source/blender/editors/object/object_bake.c

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

diff --git a/source/blender/editors/object/object_bake.c b/source/blender/editors/object/object_bake.c
index effbde41c38..3170ce2c620 100644
--- a/source/blender/editors/object/object_bake.c
+++ b/source/blender/editors/object/object_bake.c
@@ -161,9 +161,10 @@ static bool multiresbake_check(bContext *C, wmOperator *op)
       ok = false;
     }
     else {
+      const int *material_indices = BKE_mesh_material_indices(me);
       a = me->totpoly;
       while (ok && a--) {
-        Image *ima = bake_object_image_get(ob, me->mpoly[a].mat_nr);
+        Image *ima = bake_object_image_get(ob, material_indices ? material_indices[a] : 0);
 
         if (!ima) {
           BKE_report(