Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--source/blender/editors/space_view3d/drawobject.c5
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);
}