forked from bartvdbraak/blender
Fix T43010 regression in material setting.
Caused by own fix for another display case. Shoud be safe for 2.73 final.
This commit is contained in:
parent
fd47202043
commit
e0cf86a9e2
@ -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;
|
||||
|
||||
|
@ -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];
|
||||
|
Loading…
Reference in New Issue
Block a user