diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-01-15 14:47:44 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-01-15 14:47:44 +0400 |
| commit | 7aa9401a08b4744655c91b31408411cf3f761b5b (patch) | |
| tree | 233b96fde1194c5006d106420fec22bdf03dbdae /source | |
| parent | 8b204f131af3d40be3fbb0b59eb94ea996de4120 (diff) | |
Fix #33741,#33856: multi texture drawing problem with VBO's after a recent bugfix.
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/editors/space_view3d/drawmesh.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/source/blender/editors/space_view3d/drawmesh.c b/source/blender/editors/space_view3d/drawmesh.c index fa72f28cc44..22bf605168d 100644 --- a/source/blender/editors/space_view3d/drawmesh.c +++ b/source/blender/editors/space_view3d/drawmesh.c @@ -458,12 +458,15 @@ static DMDrawOption draw_mcol__set_draw_legacy(MTFace *UNUSED(tface), int has_mc return DM_DRAW_OPTION_NO_MCOL; } -static DMDrawOption draw_tface__set_draw(MTFace *UNUSED(tface), int UNUSED(has_mcol), int matnr) +static DMDrawOption draw_tface__set_draw(MTFace *tface, int UNUSED(has_mcol), int matnr) { Material *ma = give_current_material(Gtexdraw.ob, matnr + 1); if (ma && (ma->game.flag & GEMAT_INVISIBLE)) return 0; + if (tface) + set_draw_settings_cached(0, tface, ma, Gtexdraw); + /* always use color from mcol, as set in update_tface_color_layer */ return DM_DRAW_OPTION_NORMAL; } |