blender
/
blender
134
400
Fork 584
Code Issues 6.3k Pull Requests 760 Projects 19 Wiki Activity

Fix T47517: "Show Weights" edit-mode fails 

Don't use materials when showing weight colors.
This commit is contained in:
Campbell Barton 2016-02-23 01:22:32 +11:00
parent 7a74738914
commit e3f997d47f
Notes: blender-bot 2023-02-14 08:11:19 +01:00 
Referenced by issue #47517, "Show Weights" in Edit mode does not work in conjunction with a "Vertex Weight Proximity" Modifier
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
source/blender/editors/space_view3d/drawobject.c
View File

@ -4248,20 +4248,26 @@ static bool draw_mesh_object(Scene *scene, ARegion *ar, View3D *v3d, RegionView3
scene, ob, em, scene->customdata_mask,
&finalDM);
const bool use_material = ((me->drawflag & ME_DRAWEIGHT) == 0);
DM_update_materials(finalDM, ob);
if (cageDM != finalDM) {
DM_update_materials(cageDM, ob);
}
if (dt > OB_WIRE) {
const bool glsl = draw_glsl_material(scene, ob, v3d, dt);
if (use_material) {
if (dt > OB_WIRE) {
const bool glsl = draw_glsl_material(scene, ob, v3d, dt);
GPU_begin_object_materials(v3d, rv3d, scene, ob, glsl, NULL);
GPU_begin_object_materials(v3d, rv3d, scene, ob, glsl, NULL);
}
}
draw_em_fancy(scene, ar, v3d, ob, em, cageDM, finalDM, dt);
GPU_end_object_materials();
if (use_material) {
GPU_end_object_materials();
}
if (obedit != ob)
finalDM->release(finalDM);