From 0b7d0f913d4e5068afb15189bb077d4e84cebfda Mon Sep 17 00:00:00 2001 From: Antony Riakiotakis Date: Wed, 22 Jul 2015 16:58:18 +0200 Subject: Fix weight painting + mask not drawing in latest master. Same issue as vertex painting - though one might wonder if we really need to set material on such occasions. --- source/blender/editors/space_view3d/drawmesh.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'source/blender/editors/space_view3d') diff --git a/source/blender/editors/space_view3d/drawmesh.c b/source/blender/editors/space_view3d/drawmesh.c index 757eecfe1db..ea1e3178bd0 100644 --- a/source/blender/editors/space_view3d/drawmesh.c +++ b/source/blender/editors/space_view3d/drawmesh.c @@ -1220,11 +1220,13 @@ static void draw_mesh_paint_light_end(void) void draw_mesh_paint_weight_faces(DerivedMesh *dm, const bool use_light, void *facemask_cb, void *user_data) { + DMSetMaterial setMaterial = GPU_object_materials_check() ? GPU_enable_material : NULL; + if (use_light) { draw_mesh_paint_light_begin(); } - dm->drawMappedFaces(dm, (DMSetDrawOptions)facemask_cb, GPU_enable_material, NULL, user_data, + dm->drawMappedFaces(dm, (DMSetDrawOptions)facemask_cb, setMaterial, NULL, user_data, DM_DRAW_USE_COLORS); if (use_light) { -- cgit v1.2.3