diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2010-11-26 00:59:12 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2010-11-26 00:59:12 +0300 |
| commit | 2b4cf2ac8da8079edc297eb49e44cde3b0573085 (patch) | |
| tree | 26f94e9fa78a77d0b1402a9c5baf512b57c64ef2 /source/blender/editors/space_view3d/drawmesh.c | |
| parent | 6f1077ed2cc0070ffcefcd5b0ba0fa8d6033c465 (diff) | |
bugfix while looking into [#24900], color wasn't being set for face-mask mode.
Diffstat (limited to 'source/blender/editors/space_view3d/drawmesh.c')
| -rw-r--r-- | source/blender/editors/space_view3d/drawmesh.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/space_view3d/drawmesh.c b/source/blender/editors/space_view3d/drawmesh.c index f9af8bd5e79..0fb7ff8ec38 100644 --- a/source/blender/editors/space_view3d/drawmesh.c +++ b/source/blender/editors/space_view3d/drawmesh.c @@ -661,8 +661,9 @@ void draw_mesh_textured(Scene *scene, View3D *v3d, RegionView3D *rv3d, Object *o /* draw the textured mesh */ draw_textured_begin(scene, v3d, rv3d, ob); + glColor4f(1.0f,1.0f,1.0f,1.0f); + if(ob->mode & OB_MODE_EDIT) { - glColor4f(1.0f,1.0f,1.0f,1.0f); dm->drawMappedFacesTex(dm, draw_em_tf_mapped__set_draw, me->edit_mesh); } else if(faceselect) { if(ob->mode & OB_MODE_WEIGHT_PAINT) @@ -674,7 +675,6 @@ void draw_mesh_textured(Scene *scene, View3D *v3d, RegionView3D *rv3d, Object *o if( GPU_buffer_legacy(dm) ) dm->drawFacesTex(dm, draw_tface__set_draw_legacy); else { - glColor4f(1.0f,1.0f,1.0f,1.0f); if( !CustomData_has_layer(&dm->faceData,CD_TEXTURE_MCOL) ) add_tface_color_layer(dm); dm->drawFacesTex(dm, draw_tface__set_draw); |