[Bf-blender-cvs] [0dfe30502a0] blender-v2.83-release: Fix T75938: Workbench normal direction for matcaps

[Robert Guetzkow]

Commit: 0dfe30502a02c0567be50f980a8f1e00198cf93e
Author: Robert Guetzkow
Date:   Wed Apr 22 19:08:00 2020 +0200
Branches: blender-v2.83-release
https://developer.blender.org/rB0dfe30502a02c0567be50f980a8f1e00198cf93e

Fix T75938: Workbench normal direction for matcaps

Set useMatcap to ensure correct normal direction when using matcaps
in the workbench engine.

===================================================================

M	release/datafiles/locale
M	release/scripts/addons
M	source/blender/draw/engines/workbench/workbench_opaque.c
M	source/tools

===================================================================

diff --git a/release/datafiles/locale b/release/datafiles/locale
index c68481a509e..80f390fd0e2 160000
--- a/release/datafiles/locale
+++ b/release/datafiles/locale
@@ -1 +1 @@
-Subproject commit c68481a509eaf79ce61a4391ec1e11a7760d5457
+Subproject commit 80f390fd0e20d7e2aadf07c43a45717e810fa10d
diff --git a/release/scripts/addons b/release/scripts/addons
index f12430cae60..44c17b01168 160000
--- a/release/scripts/addons
+++ b/release/scripts/addons
@@ -1 +1 @@
-Subproject commit f12430cae606db8aeeb72f99fe15ebbd71d4a92c
+Subproject commit 44c17b01168ea180d7ea865e9ec1ef6e93097b3a
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
index 8a36c2833db..35dd27ded66 160000
--- a/source/tools
+++ b/source/tools
@@ -1 +1 @@
-Subproject commit 8a36c2833db48ed78c436ee19534ce5cf3b2eeee
+Subproject commit 35dd27ded664b1068e773c27988ee221f3ce39d9