From 2fd7a56526a356a984e5c03354834bd7ada94014 Mon Sep 17 00:00:00 2001 From: Nicholas Bishop Date: Tue, 6 Mar 2012 21:21:22 +0000 Subject: Fix textured-mode drawing in editmode. It's currently not respecting the material color, probably since the BMesh merge. There are a couple problems, both involving "dummy" variables taking the place of actual MTFace/MCol data. Code review: http://codereview.appspot.com/5753050/ --- source/blender/editors/space_view3d/drawmesh.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'source/blender/editors/space_view3d/drawmesh.c') diff --git a/source/blender/editors/space_view3d/drawmesh.c b/source/blender/editors/space_view3d/drawmesh.c index f41846f3378..9ad7a196113 100644 --- a/source/blender/editors/space_view3d/drawmesh.c +++ b/source/blender/editors/space_view3d/drawmesh.c @@ -571,7 +571,8 @@ static int draw_em_tf_mapped__set_draw(void *userData, int index) ME_MTEXFACE_CPY(&mtf, tpoly); } - return draw_tface__set_draw_legacy(&mtf, data->has_mcol, matnr); + return draw_tface__set_draw_legacy(data->has_mtface ? &mtf : NULL, + data->has_mcol, matnr); } } -- cgit v1.2.3