Fix part of #30917: solid + glsl + textured solid in texture paint mode did not
authorBrecht Van Lommel <brechtvanlommel@pandora.be>
Thu, 12 Apr 2012 17:34:29 +0000 (17:34 +0000)
committerBrecht Van Lommel <brechtvanlommel@pandora.be>
Thu, 12 Apr 2012 17:34:29 +0000 (17:34 +0000)
show textured solid as it should, was using glsl instead.

source/blender/editors/space_view3d/drawobject.c

index 29b12708e2da3a44a56387f4d9deaeff0f34a710..51b238eb58693517432165b820dd2c8a06f3d622 100644 (file)
@@ -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);
                        }