diff options
| author | Miika Hamalainen <blender@miikah.org> | 2011-09-05 21:06:09 +0400 |
|---|---|---|
| committer | Miika Hamalainen <blender@miikah.org> | 2011-09-05 21:06:09 +0400 |
| commit | 42faf7ae41d807c2f9a94f40b774038af0c065ec (patch) | |
| tree | 8460e4d70cf287da04b656748297521d0d3ef381 /source/blender/editors/space_view3d/drawmesh.c | |
| parent | 79ef35889f850aa7173800bcf67918c14f3b1291 (diff) | |
| parent | 59dbd53e72ae25edf247e49ea1e291af277fecc4 (diff) | |
Merge with trunk r39928
Diffstat (limited to 'source/blender/editors/space_view3d/drawmesh.c')
| -rw-r--r-- | source/blender/editors/space_view3d/drawmesh.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/space_view3d/drawmesh.c b/source/blender/editors/space_view3d/drawmesh.c index 3cc11df8a40..9acdd8d5be1 100644 --- a/source/blender/editors/space_view3d/drawmesh.c +++ b/source/blender/editors/space_view3d/drawmesh.c @@ -612,7 +612,7 @@ void draw_mesh_textured(Scene *scene, View3D *v3d, RegionView3D *rv3d, Object *o } else if(draw_flags & DRAW_IS_PAINT_SEL) { if(ob->mode & OB_MODE_WEIGHT_PAINT) - dm->drawMappedFaces(dm, wpaint__setSolidDrawOptions, me, 1, GPU_enable_material); + dm->drawMappedFaces(dm, wpaint__setSolidDrawOptions, me, 1, GPU_enable_material, NULL); else dm->drawMappedFacesTex(dm, me->mface ? draw_tface_mapped__set_draw : NULL, me); } |