diff options
Diffstat (limited to 'intern/cycles/kernel/kernel_types.h')
| -rw-r--r-- | intern/cycles/kernel/kernel_types.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/intern/cycles/kernel/kernel_types.h b/intern/cycles/kernel/kernel_types.h index 78724d71ffa..caf68e913e8 100644 --- a/intern/cycles/kernel/kernel_types.h +++ b/intern/cycles/kernel/kernel_types.h @@ -55,7 +55,7 @@ CCL_NAMESPACE_BEGIN #ifdef __KERNEL_CPU__ #define __KERNEL_SHADING__ #define __KERNEL_ADV_SHADING__ -#define __NON_PROGRESSIVE__ +#define __BRANCHED_PATH__ #ifdef WITH_OSL #define __OSL__ #endif @@ -67,7 +67,7 @@ CCL_NAMESPACE_BEGIN #define __KERNEL_SHADING__ #if __CUDA_ARCH__ >= 200 #define __KERNEL_ADV_SHADING__ -#define __NON_PROGRESSIVE__ +#define __BRANCHED_PATH__ #endif #endif @@ -763,8 +763,8 @@ typedef struct KernelIntegrator { /* clamp */ float sample_clamp; - /* non-progressive */ - int progressive; + /* branched path */ + int branched; int aa_samples; int diffuse_samples; int glossy_samples; |