Blender Git Commit Log
Git Commits -> Revision 6670019
Revision 6670019 by Jeroen Bakker (master) August 27, 2019, 06:56 (GMT) |
Workbench: Specular Highlighting for MatCaps With Blender 2.80 we introduced a more flexible matcap system. One change we did was to multiply the matcap with the base color that was shaded. As matcaps contains diffuse and specular lighting in a single texture this lead to rendering artifacts. Artists were complaining that everything looked to metalic. We now support a separate `diffuse` and `specular` pass for matcaps. `shaded_color = diffuse_light * base_color + specular_light` For matcaps to support this feature they need to be multilayer openexr files with 2 renderpasses (named `diffuse` and `specular`). In the future we can change this to first pass/second pass in stead of this naming convention. Reviewed By: fclem, brecht Differential Revision: https://developer.blender.org/D5335 |
Commit Details:
Full Hash: 66700196074ad168f3322f2766846a0a07f7a00f
Parent Commit: bc51250
Lines Changed: +349, -89
13 Modified Paths:
/release/scripts/startup/bl_ui/space_view3d.py (+3, -1) (Diff)
/source/blender/blenkernel/BKE_studiolight.h (+12, -0) (Diff)
/source/blender/blenkernel/intern/studiolight.c (+243, -57) (Diff)
/source/blender/draw/engines/workbench/shaders/workbench_deferred_composite_frag.glsl (+11, -3) (Diff)
/source/blender/draw/engines/workbench/shaders/workbench_forward_transparent_accum_frag.glsl (+9, -3) (Diff)
/source/blender/draw/engines/workbench/workbench_deferred.c (+10, -4) (Diff)
/source/blender/draw/engines/workbench/workbench_forward.c (+18, -6) (Diff)
/source/blender/draw/engines/workbench/workbench_materials.c (+7, -5) (Diff)
/source/blender/draw/engines/workbench/workbench_private.h (+12, -5) (Diff)
/source/blender/gpu/intern/gpu_draw.c (+3, -3) (Diff)
/source/blender/imbuf/IMB_imbuf.h (+2, -1) (Diff)
/source/blender/imbuf/intern/allocimbuf.c (+3, -1) (Diff)
/source/blender/makesrna/intern/rna_userdef.c (+16, -0) (Diff)
/source/blender/blenkernel/BKE_studiolight.h (+12, -0) (Diff)
/source/blender/blenkernel/intern/studiolight.c (+243, -57) (Diff)
/source/blender/draw/engines/workbench/shaders/workbench_deferred_composite_frag.glsl (+11, -3) (Diff)
/source/blender/draw/engines/workbench/shaders/workbench_forward_transparent_accum_frag.glsl (+9, -3) (Diff)
/source/blender/draw/engines/workbench/workbench_deferred.c (+10, -4) (Diff)
/source/blender/draw/engines/workbench/workbench_forward.c (+18, -6) (Diff)
/source/blender/draw/engines/workbench/workbench_materials.c (+7, -5) (Diff)
/source/blender/draw/engines/workbench/workbench_private.h (+12, -5) (Diff)
/source/blender/gpu/intern/gpu_draw.c (+3, -3) (Diff)
/source/blender/imbuf/IMB_imbuf.h (+2, -1) (Diff)
/source/blender/imbuf/intern/allocimbuf.c (+3, -1) (Diff)
/source/blender/makesrna/intern/rna_userdef.c (+16, -0) (Diff)