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
path: root/source
diff options
context:
space:
mode:
authorClément Foucault <foucault.clem@gmail.com>2018-03-06 18:52:06 +0300
committerClément Foucault <foucault.clem@gmail.com>2018-03-06 18:52:06 +0300
commitfaf70e1e64b88e047efbc34004f46466f0b48c8a (patch)
treeb5f13e59375f7f873d0dadbb638d2e407a846b43 /source
parentd5ecadd643c14f9f22128112a020aa48b74584fc (diff)
Eevee: Fix crash with volumetrics + default mat + alpha blend
Diffstat (limited to 'source')
-rw-r--r--source/blender/draw/engines/eevee/eevee_private.h14
1 files changed, 7 insertions, 7 deletions
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),