diff options
| author | Nicholas Bishop <nicholasbishop@gmail.com> | 2012-03-07 01:21:22 +0400 |
|---|---|---|
| committer | Nicholas Bishop <nicholasbishop@gmail.com> | 2012-03-07 01:21:22 +0400 |
| commit | 2fd7a56526a356a984e5c03354834bd7ada94014 (patch) | |
| tree | f4921d82eaba38671efb08577f1e96caa854147b /source/blender/editors/space_view3d/drawmesh.c | |
| parent | ef67172587af7afa81998ab0103742b58a4b25eb (diff) | |
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/
Diffstat (limited to 'source/blender/editors/space_view3d/drawmesh.c')
| -rw-r--r-- | source/blender/editors/space_view3d/drawmesh.c | 3 |
1 files changed, 2 insertions, 1 deletions
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); } } |