diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-04-12 21:34:29 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-04-12 21:34:29 +0400 |
| commit | 2a5a465e2c05dc4d3864019790f745ab75755389 (patch) | |
| tree | fa14c668f8779e30f4ba50d66d06f51e3d49e56d /source | |
| parent | 10a333556a5b7d05bb42e61e8f42dac10ed8cad1 (diff) | |
Fix part of #30917: solid + glsl + textured solid in texture paint mode did not
show textured solid as it should, was using glsl instead.
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/editors/space_view3d/drawobject.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c index 29b12708e2d..51b238eb586 100644 --- a/source/blender/editors/space_view3d/drawobject.c +++ b/source/blender/editors/space_view3d/drawobject.c @@ -3447,7 +3447,7 @@ static void draw_mesh_fancy(Scene *scene, ARegion *ar, View3D *v3d, RegionView3D GPU_disable_material(); } - else if (ob->mode & (OB_MODE_VERTEX_PAINT | OB_MODE_TEXTURE_PAINT)) { + else if (ob->mode & OB_MODE_VERTEX_PAINT) { if (me->mloopcol) dm->drawMappedFaces(dm, NULL, GPU_enable_material, NULL, NULL, DM_DRAW_USE_COLORS | DM_DRAW_ALWAYS_SMOOTH); @@ -6527,9 +6527,8 @@ void draw_object(Scene *scene, ARegion *ar, View3D *v3d, Base *base, int flag) zbufoff = 1; dt = OB_SOLID; } - else { + else if(ob->mode & (OB_MODE_VERTEX_PAINT | OB_MODE_WEIGHT_PAINT)) dt = OB_PAINT; - } glEnable(GL_DEPTH_TEST); } |