From 2002b29ecd2b8fff6f1320fa194f8d7525bf9b2e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Foucault?= <foucault.clem@gmail.com>
Date: Mon, 1 Jul 2019 22:29:16 +0200
Subject: Workbench: Combine Xray Alpha with object/material alpha ...

... instead of overiding it (previous behavior).

In practice it's not really noticeable.
This means an object with alpha will never be more opaque when enabling
xray.
---
 source/blender/draw/engines/workbench/workbench_private.h | 1 +
 1 file changed, 1 insertion(+)

(limited to 'source/blender/draw/engines/workbench/workbench_private.h')

diff --git a/source/blender/draw/engines/workbench/workbench_private.h b/source/blender/draw/engines/workbench/workbench_private.h
index 34196c6aa04..3b62ed33e96 100644
--- a/source/blender/draw/engines/workbench/workbench_private.h
+++ b/source/blender/draw/engines/workbench/workbench_private.h
@@ -286,6 +286,7 @@ typedef struct WORKBENCH_MaterialData {
   float base_color[3];
   float diffuse_color[3];
   float specular_color[3];
+  float alpha;
   float metallic;
   float roughness;
   int object_id;
-- 
cgit v1.2.3