diff options
| author | Antony Riakiotakis <kalast@gmail.com> | 2014-12-26 22:06:56 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-01-06 12:33:36 +0300 |
| commit | 950be80ab8620b989a70a5f7b140b3cd039e06b3 (patch) | |
| tree | ff6093a82ce2312231d20a030f3918fc2f4f407f | |
| parent | 919ec85f6c0109e1aa74ffa338f3f5cf0d151fac (diff) | |
Fix T43010 regression in material setting.
Caused by own fix for another display case.
Shoud be safe for 2.73 final.
| -rw-r--r-- | source/blender/blenkernel/intern/editderivedmesh.c | 4 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/material.c | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/source/blender/blenkernel/intern/editderivedmesh.c b/source/blender/blenkernel/intern/editderivedmesh.c index 559eefc834e..68fc6e68ef2 100644 --- a/source/blender/blenkernel/intern/editderivedmesh.c +++ b/source/blender/blenkernel/intern/editderivedmesh.c @@ -790,7 +790,7 @@ static void emDM_drawFacesTex_common(DerivedMesh *dm, if (drawParams) draw_option = drawParams(&mtf, has_vcol, efa->mat_nr); else if (drawParamsMapped) - draw_option = drawParamsMapped(userData, BM_elem_index_get(efa), BM_elem_index_get(efa)); + draw_option = drawParamsMapped(userData, BM_elem_index_get(efa), efa->mat_nr); else draw_option = DM_DRAW_OPTION_NORMAL; @@ -859,7 +859,7 @@ static void emDM_drawFacesTex_common(DerivedMesh *dm, if (drawParams) draw_option = drawParams(&mtf, has_vcol, efa->mat_nr); else if (drawParamsMapped) - draw_option = drawParamsMapped(userData, BM_elem_index_get(efa), BM_elem_index_get(efa)); + draw_option = drawParamsMapped(userData, BM_elem_index_get(efa), efa->mat_nr); else draw_option = DM_DRAW_OPTION_NORMAL; diff --git a/source/blender/blenkernel/intern/material.c b/source/blender/blenkernel/intern/material.c index 319e6271265..83800a3fb2f 100644 --- a/source/blender/blenkernel/intern/material.c +++ b/source/blender/blenkernel/intern/material.c @@ -681,16 +681,16 @@ Material *give_current_material(Object *ob, short act) /* if object cannot have material, (totcolp == NULL) */ totcolp = give_totcolp(ob); if (totcolp == NULL || ob->totcol == 0) return NULL; - - if (act < 0) { - printf("Negative material index!\n"); - } - + /* return NULL for invalid 'act', can happen for mesh face indices */ if (act > ob->totcol) return NULL; - else if (act <= 0) + else if (act <= 0) { + if (act < 0) { + printf("Negative material index!\n"); + } return NULL; + } if (ob->matbits && ob->matbits[act - 1]) { /* in object */ ma = ob->mat[act - 1]; |