diff options
Diffstat (limited to 'source/blender/render/intern/source/bake.c')
| -rw-r--r-- | source/blender/render/intern/source/bake.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/source/blender/render/intern/source/bake.c b/source/blender/render/intern/source/bake.c index 31e461b4536..71a595d6a8b 100644 --- a/source/blender/render/intern/source/bake.c +++ b/source/blender/render/intern/source/bake.c @@ -669,11 +669,12 @@ static int get_next_bake_face(BakeShade *bs) const float disp_solid[4] = {0.5f, 0.5f, 0.5f, 1.0f}; tface = RE_vlakren_get_tface(obr, vlr, obr->bakemtface, NULL, 0); + /* should use 'BKE_object_material_edit_image_get' but in this case simpler not to */ + ima = vlr->mat ? vlr->mat->edit_image : NULL; - if (!tface || !tface->tpage) + if (!tface || !ima) continue; - ima = tface->tpage; ibuf = BKE_image_acquire_ibuf(ima, NULL, NULL); if (ibuf == NULL) @@ -814,7 +815,7 @@ static void shade_tface(BakeShade *bs) ObjectInstanceRen *obi = bs->obi; ObjectRen *obr = obi->obr; MTFace *tface = RE_vlakren_get_tface(obr, vlr, obr->bakemtface, NULL, 0); - Image *ima = tface->tpage; + Image *ima = vlr->mat->edit_image; float vec[4][2]; int a, i1, i2, i3; |