diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-09-13 10:39:17 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-09-13 10:39:17 +0400 |
| commit | b310a76a1b8964fd776620f8444c1c1a7a308a8e (patch) | |
| tree | dcf2b80af79403c2b5fb81c85e337f4adc3eba2f /source/blender/editors/space_view3d/drawmesh.c | |
| parent | c58fb76f1a043124debf2a71e6c56f2a478a0dde (diff) | |
| parent | 047e8224b14aa7836db3b067824258e49e8602db (diff) | |
svn merge -r39558:39800 https://svn.blender.org/svnroot/bf-blender/trunk/blender
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 86826ffc7e1..b8d33de2e37 100644 --- a/source/blender/editors/space_view3d/drawmesh.c +++ b/source/blender/editors/space_view3d/drawmesh.c @@ -607,7 +607,7 @@ void draw_mesh_textured(Scene *scene, View3D *v3d, RegionView3D *rv3d, Object *o } else if(faceselect) { 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); } |