Blender Git Loki
Git Commits -> Revision 03bd418
Revision 03bd418 by Antonis Ryakiotakis (master) April 2, 2014, 21:39 (GMT) |
Fix T39517, Issue here is that "show diffuse" option does not respect its intended purpose which is to be used only for masking. There are a couple of caveats here: Dyntopo and multires -always- have mask data enabled, and thus as soon as one goes to dyntopo mode or adds a multires modifier he would get the default grey color instead. Matcaps would break when nodes asked for a diffuse material color (this was broken before too). Solved by adding global material state for when matcaps are enabled. Also matcaps don't always played well with VBOs off. Added a few more missing updates for mask operators to notify show_diffuse property as changed. This was also needed on rebuilding dyntopo pbvh. Also make zero mask color duller again after artist feedback. |
Commit Details:
Full Hash: 03bd418d1610da28258d361180f6eae2d8be671c
Parent Commit: a58814a
Lines Changed: +71, -18
8 Modified Paths:
/source/blender/blenkernel/intern/cdderivedmesh.c (+2, -0) (Diff)
/source/blender/blenkernel/intern/pbvh.c (+16, -1) (Diff)
/source/blender/editors/sculpt_paint/paint_mask.c (+9, -2) (Diff)
/source/blender/gpu/GPU_buffers.h (+1, -1) (Diff)
/source/blender/gpu/GPU_draw.h (+1, -0) (Diff)
/source/blender/gpu/intern/gpu_buffers.c (+32, -12) (Diff)
/source/blender/gpu/intern/gpu_draw.c (+9, -1) (Diff)
/source/blender/makesdna/DNA_view3d_types.h (+1, -1) (Diff)
/source/blender/blenkernel/intern/pbvh.c (+16, -1) (Diff)
/source/blender/editors/sculpt_paint/paint_mask.c (+9, -2) (Diff)
/source/blender/gpu/GPU_buffers.h (+1, -1) (Diff)
/source/blender/gpu/GPU_draw.h (+1, -0) (Diff)
/source/blender/gpu/intern/gpu_buffers.c (+32, -12) (Diff)
/source/blender/gpu/intern/gpu_draw.c (+9, -1) (Diff)
/source/blender/makesdna/DNA_view3d_types.h (+1, -1) (Diff)