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:
authorClément Foucault <foucault.clem@gmail.com>2019-05-28 00:21:39 +0300
committerClément Foucault <foucault.clem@gmail.com>2019-05-28 15:22:22 +0300
commite0c1116ce3dfef8415b7a975e82cd1506383ed9c (patch)
tree5e1aac7b4ed95890e8025ef28ef8147338eeb861 /source/blender/draw/engines/eevee/eevee_materials.c
parent2e211d099f8d13b79cdf9057f77532c587311c3d (diff)
Cleanup: DRW: Rename DRW_STATE_BLEND_* for API clarity
Diffstat (limited to 'source/blender/draw/engines/eevee/eevee_materials.c')
-rw-r--r--source/blender/draw/engines/eevee/eevee_materials.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/draw/engines/eevee/eevee_materials.c b/source/blender/draw/engines/eevee/eevee_materials.c
index 456f312f1df..cd75cce89a9 100644
--- a/source/blender/draw/engines/eevee/eevee_materials.c
+++ b/source/blender/draw/engines/eevee/eevee_materials.c
@@ -1476,8 +1476,8 @@ static void material_transparent(Material *ma,
const bool use_prepass = ((ma->blend_flag & MA_BL_HIDE_BACKFACE) != 0);
DRWState all_state = (DRW_STATE_WRITE_DEPTH | DRW_STATE_WRITE_COLOR | DRW_STATE_CULL_BACK |
- DRW_STATE_DEPTH_LESS_EQUAL | DRW_STATE_DEPTH_EQUAL | DRW_STATE_BLEND |
- DRW_STATE_ADDITIVE | DRW_STATE_MULTIPLY);
+ DRW_STATE_DEPTH_LESS_EQUAL | DRW_STATE_DEPTH_EQUAL |
+ DRW_STATE_BLEND_ALPHA | DRW_STATE_BLEND_ADD | DRW_STATE_BLEND_MUL);
DRWState cur_state = DRW_STATE_WRITE_COLOR;
cur_state |= (use_prepass) ? DRW_STATE_DEPTH_EQUAL : DRW_STATE_DEPTH_LESS_EQUAL;
@@ -1485,13 +1485,13 @@ static void material_transparent(Material *ma,
switch (ma->blend_method) {
case MA_BM_ADD:
- cur_state |= DRW_STATE_ADDITIVE;
+ cur_state |= DRW_STATE_BLEND_ADD;
break;
case MA_BM_MULTIPLY:
- cur_state |= DRW_STATE_MULTIPLY;
+ cur_state |= DRW_STATE_BLEND_MUL;
break;
case MA_BM_BLEND:
- cur_state |= DRW_STATE_BLEND;
+ cur_state |= DRW_STATE_BLEND_ALPHA;
break;
default:
BLI_assert(0);