Commit: 4878444ce70e51a064feda721110cbc9e38f4ea8
Author: Antony Riakiotakis
Date: Thu Nov 20 15:26:58 2014 +0100
Branches: master
https://developer.blender.org/rB4878444ce70e51a064feda721110cbc9e38f4ea8
Fix T42647, vertex and weight painting mode do not display solid shaded
when VBOs is off.
===================================================================
M source/blender/editors/space_view3d/drawmesh.c
===================================================================
diff --git a/source/blender/editors/space_view3d/drawmesh.c
b/source/blender/editors/space_view3d/drawmesh.c
index fa9ba23..7334afe 100644
--- a/source/blender/editors/space_view3d/drawmesh.c
+++ b/source/blender/editors/space_view3d/drawmesh.c
@@ -1189,7 +1189,7 @@ void draw_mesh_paint_weight_faces(DerivedMesh *dm, const
bool use_light,
}
dm->drawMappedFaces(dm, (DMSetDrawOptions)facemask_cb,
GPU_enable_material, NULL, user_data,
- DM_DRAW_USE_COLORS | DM_DRAW_ALWAYS_SMOOTH);
+ DM_DRAW_USE_COLORS);
if (use_light) {
draw_mesh_paint_light_end();
@@ -1206,12 +1206,11 @@ void draw_mesh_paint_vcolor_faces(DerivedMesh *dm,
const bool use_light,
if (me->mloopcol) {
dm->drawMappedFaces(dm, facemask_cb, GPU_enable_material, NULL,
user_data,
- DM_DRAW_USE_COLORS | DM_DRAW_ALWAYS_SMOOTH);
+ DM_DRAW_USE_COLORS);
}
else {
glColor3f(1.0f, 1.0f, 1.0f);
- dm->drawMappedFaces(dm, facemask_cb, GPU_enable_material, NULL,
user_data,
- DM_DRAW_ALWAYS_SMOOTH);
+ dm->drawMappedFaces(dm, facemask_cb, GPU_enable_material, NULL,
user_data, 0);
}
if (use_light) {
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
