Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Guetzkow <gitcommit@outlook.de>2020-04-22 20:08:00 +0300
committerRobert Guetzkow <gitcommit@outlook.de>2020-04-22 20:13:38 +0300
commit0dfe30502a02c0567be50f980a8f1e00198cf93e (patch)
tree93920f9e9400e86f2ea6f9c1f8fd2a6f87cd605d /source/blender/draw/engines/workbench
parentf9649e2bf1848d44ddf8739dd3ef6e087f291f28 (diff)
Fix T75938: Workbench normal direction for matcaps
Set useMatcap to ensure correct normal direction when using matcaps in the workbench engine.
Diffstat (limited to 'source/blender/draw/engines/workbench')
-rw-r--r--source/blender/draw/engines/workbench/workbench_opaque.c2
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);