diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2017-10-17 06:06:49 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2017-10-17 06:06:49 +0300 |
| commit | 0ffa64a45f7d961cb079a56629bcff105c81eb56 (patch) | |
| tree | 238bdd23687e6b54c1f75a35e5497837e8662bea /intern | |
| parent | dd91d7d09d9994bc20bdbfb501d5101044ac99c8 (diff) | |
| parent | 99520e3f92e14eb3b7fab3f7decd0914a3da1360 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/cycles/kernel/kernel_types.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/intern/cycles/kernel/kernel_types.h b/intern/cycles/kernel/kernel_types.h index f76d6c2e556..2ae003227dc 100644 --- a/intern/cycles/kernel/kernel_types.h +++ b/intern/cycles/kernel/kernel_types.h @@ -409,7 +409,7 @@ typedef enum DenoisingPassOffsets { DENOISING_PASS_SIZE_CLEAN = 3, } DenoisingPassOffsets; -typedef enum BakePassFilter { +typedef enum eBakePassFilter { BAKE_FILTER_NONE = 0, BAKE_FILTER_DIRECT = (1 << 0), BAKE_FILTER_INDIRECT = (1 << 1), @@ -420,7 +420,7 @@ typedef enum BakePassFilter { BAKE_FILTER_SUBSURFACE = (1 << 6), BAKE_FILTER_EMISSION = (1 << 7), BAKE_FILTER_AO = (1 << 8), -} BakePassFilter; +} eBakePassFilter; typedef enum BakePassFilterCombos { BAKE_FILTER_COMBINED = ( |