Commit: faf70e1e64b88e047efbc34004f46466f0b48c8a
Author: Clément Foucault
Date: Tue Mar 6 16:52:06 2018 +0100
Branches: blender2.8
https://developer.blender.org/rBfaf70e1e64b88e047efbc34004f46466f0b48c8a
Eevee: Fix crash with volumetrics + default mat + alpha blend
===================================================================
M source/blender/draw/engines/eevee/eevee_private.h
===================================================================
diff --git a/source/blender/draw/engines/eevee/eevee_private.h
b/source/blender/draw/engines/eevee/eevee_private.h
index 70e8d56d546..03e93f79d93 100644
--- a/source/blender/draw/engines/eevee/eevee_private.h
+++ b/source/blender/draw/engines/eevee/eevee_private.h
@@ -107,18 +107,18 @@ enum {
VAR_MAT_BLEND = (1 << 4),
VAR_MAT_VSM = (1 << 5),
VAR_MAT_ESM = (1 << 6),
+ VAR_MAT_VOLUME = (1 << 7),
/* Max number of variation */
/* IMPORTANT : Leave it last and set
* it's value accordingly. */
- VAR_MAT_MAX = (1 << 7),
+ VAR_MAT_MAX = (1 << 8),
/* These are options that are not counted in VAR_MAT_MAX
* because they are not cumulative with the others above. */
- VAR_MAT_CLIP = (1 << 8),
- VAR_MAT_HASH = (1 << 9),
- VAR_MAT_MULT = (1 << 10),
- VAR_MAT_SHADOW = (1 << 11),
- VAR_MAT_REFRACT = (1 << 12),
- VAR_MAT_VOLUME = (1 << 13),
+ VAR_MAT_CLIP = (1 << 9),
+ VAR_MAT_HASH = (1 << 10),
+ VAR_MAT_MULT = (1 << 11),
+ VAR_MAT_SHADOW = (1 << 12),
+ VAR_MAT_REFRACT = (1 << 13),
VAR_MAT_SSS = (1 << 14),
VAR_MAT_TRANSLUC = (1 << 15),
VAR_MAT_SSSALBED = (1 << 16),
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
