griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix part of #30917: solid + glsl + textured solid in texture paint mode did not

Browse Source 
show textured solid as it should, was using glsl instead.
This commit is contained in:
Brecht Van Lommel
2012-04-12 17:34:29 +00:00
parent 10a333556a
commit 2a5a465e2c
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
source/blender/editors/space_view3d/drawobject.c
View 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);
}