diff options
| m--------- | release/datafiles/locale | 0 | ||||
| m--------- | release/scripts/addons | 0 | ||||
| -rw-r--r-- | source/blender/draw/engines/workbench/workbench_opaque.c | 2 | ||||
| m--------- | source/tools | 0 |
4 files changed, 2 insertions, 0 deletions
diff --git a/release/datafiles/locale b/release/datafiles/locale -Subproject c68481a509eaf79ce61a4391ec1e11a7760d545 +Subproject 80f390fd0e20d7e2aadf07c43a45717e810fa10 diff --git a/release/scripts/addons b/release/scripts/addons -Subproject f12430cae606db8aeeb72f99fe15ebbd71d4a92 +Subproject 44c17b01168ea180d7ea865e9ec1ef6e93097b3 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); diff --git a/source/tools b/source/tools -Subproject 8a36c2833db48ed78c436ee19534ce5cf3b2eee +Subproject 35dd27ded664b1068e773c27988ee221f3ce39d |