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:
authorJeroen Bakker <j.bakker@atmind.nl>2019-05-23 17:31:13 +0300
committerJeroen Bakker <j.bakker@atmind.nl>2019-05-23 17:34:36 +0300
commit28ad1e0b1f0ab2724fec92b1094f7e1313b0e7ab (patch)
tree163c5b854b39eed9259d9f570e1cb20630a2723e /source/blender/draw
parentb432209f63f873a025a7f4c3a79aa1d697dc9b98 (diff)
Fix T65035: Wokbench Material Alpha
When using texture drawing the material alpha was not set correctly, It used the `shading.xray_alpha` as this was the default set in the forward renderer.
Diffstat (limited to 'source/blender/draw')
-rw-r--r--source/blender/draw/engines/workbench/workbench_deferred.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/source/blender/draw/engines/workbench/workbench_deferred.c b/source/blender/draw/engines/workbench/workbench_deferred.c
index eacd319cc4a..28104a87b9a 100644
--- a/source/blender/draw/engines/workbench/workbench_deferred.c
+++ b/source/blender/draw/engines/workbench/workbench_deferred.c
@@ -983,6 +983,8 @@ void workbench_deferred_solid_cache_populate(WORKBENCH_Data *vedata, Object *ob)
workbench_material_get_image_and_mat(ob, i + 1, &image, &iuser, &interp, &mat);
int color_type = workbench_material_determine_color_type(wpd, image, ob, is_sculpt_mode);
if (color_type == V3D_SHADING_MATERIAL_COLOR && mat && mat->a < 1.0) {
+ /* Hack */
+ wpd->shading.xray_alpha = mat->a;
material = workbench_forward_get_or_create_material_data(
vedata, ob, mat, image, iuser, color_type, 0, is_sculpt_mode);
has_transp_mat = true;