diff options
| author | Robert Guetzkow <gitcommit@outlook.de> | 2020-04-22 20:20:11 +0300 |
|---|---|---|
| committer | Robert Guetzkow <gitcommit@outlook.de> | 2020-04-22 20:20:11 +0300 |
| commit | 22cf2572d97d890b4aac43a325ab0a8c2bcc437a (patch) | |
| tree | bb7fa39da7b23fe0f14b9b802e79ab6357de3e05 /source/blender/draw | |
| parent | f5b540593cd599cf47ad6763b87033c6c0964d87 (diff) | |
| parent | 0dfe30502a02c0567be50f980a8f1e00198cf93e (diff) | |
Merge branch 'blender-v2.83-release'
Diffstat (limited to 'source/blender/draw')
| -rw-r--r-- | source/blender/draw/engines/workbench/workbench_opaque.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/source/blender/draw/engines/workbench/workbench_opaque.c b/source/blender/draw/engines/workbench/workbench_opaque.c index 08511ca092c..c9c43e785ca 100644 --- a/source/blender/draw/engines/workbench/workbench_opaque.c +++ b/source/blender/draw/engines/workbench/workbench_opaque.c @@ -92,10 +92,12 @@ void workbench_opaque_cache_init(WORKBENCH_Data *data) wpd->prepass[opaque][infront][hair].common_shgrp = grp = DRW_shgroup_create(sh, pass); DRW_shgroup_uniform_block(grp, "material_block", wpd->material_ubo_curr); DRW_shgroup_uniform_int_copy(grp, "materialIndex", -1); + DRW_shgroup_uniform_bool_copy(grp, "useMatcap", use_matcap); wpd->prepass[opaque][infront][hair].vcol_shgrp = grp = DRW_shgroup_create(sh, pass); DRW_shgroup_uniform_block_persistent(grp, "material_block", wpd->material_ubo_curr); DRW_shgroup_uniform_int_copy(grp, "materialIndex", 0); /* Default material. (uses vcol) */ + DRW_shgroup_uniform_bool_copy(grp, "useMatcap", use_matcap); sh = workbench_shader_opaque_image_get(wpd, hair, false); |