diff options
| author | Bastien Montagne <b.mont29@gmail.com> | 2020-02-28 12:45:29 +0300 |
|---|---|---|
| committer | Bastien Montagne <b.mont29@gmail.com> | 2020-02-28 12:45:29 +0300 |
| commit | eb043d44f26bc8c245f2a3ad42d65ab5626003e4 (patch) | |
| tree | 40c355a26858d81296da08a06c2a8ec502f55297 /intern/cycles/kernel/kernel_types.h | |
| parent | 88e1152d4acc2852bb45f0726e27f507a502fbeb (diff) | |
| parent | 9cac5fa681c55edcf6e856e59e07e90e2ae25965 (diff) | |
Merge branch 'master' into id-ensure-unique-memory-addressid-ensure-unique-memory-address
Diffstat (limited to 'intern/cycles/kernel/kernel_types.h')
| -rw-r--r-- | intern/cycles/kernel/kernel_types.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/kernel/kernel_types.h b/intern/cycles/kernel/kernel_types.h index 75187ad1bd2..442b84a4f41 100644 --- a/intern/cycles/kernel/kernel_types.h +++ b/intern/cycles/kernel/kernel_types.h @@ -390,7 +390,7 @@ typedef enum PassType { PASS_TRANSMISSION_DIRECT, PASS_TRANSMISSION_INDIRECT, PASS_TRANSMISSION_COLOR, - PASS_VOLUME_DIRECT, + PASS_VOLUME_DIRECT = 50, PASS_VOLUME_INDIRECT, /* No Scatter color since it's tricky to define what it would even mean. */ PASS_CATEGORY_LIGHT_END = 63, |