diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-12-23 12:49:59 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-01-23 14:14:17 +0300 |
| commit | b9311b5e5a51fec85e3bb3c1d3eaa8a2dcc839e3 (patch) | |
| tree | 585552fa1062a539bef4e66850ad265946030c13 /intern/cycles/kernel/kernel_path.h | |
| parent | 2ae39ff6b192b259e6a2c593d72a9c9008a029c4 (diff) | |
Cycles: Make object flag names more obvious that hey are object and not shader
Diffstat (limited to 'intern/cycles/kernel/kernel_path.h')
| -rw-r--r-- | intern/cycles/kernel/kernel_path.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/intern/cycles/kernel/kernel_path.h b/intern/cycles/kernel/kernel_path.h index e25f2597366..557c308b747 100644 --- a/intern/cycles/kernel/kernel_path.h +++ b/intern/cycles/kernel/kernel_path.h @@ -777,11 +777,11 @@ ccl_device_inline float4 kernel_path_integrate(KernelGlobals *kg, /* holdout */ #ifdef __HOLDOUT__ - if((sd.flag & (SD_HOLDOUT|SD_HOLDOUT_MASK)) && (state.flag & PATH_RAY_CAMERA)) { + if((sd.flag & (SD_HOLDOUT|SD_OBJECT_HOLDOUT_MASK)) && (state.flag & PATH_RAY_CAMERA)) { if(kernel_data.background.transparent) { float3 holdout_weight; - if(sd.flag & SD_HOLDOUT_MASK) + if(sd.flag & SD_OBJECT_HOLDOUT_MASK) holdout_weight = make_float3(1.0f, 1.0f, 1.0f); else holdout_weight = shader_holdout_eval(kg, &sd); @@ -790,7 +790,7 @@ ccl_device_inline float4 kernel_path_integrate(KernelGlobals *kg, L_transparent += average(holdout_weight*throughput); } - if(sd.flag & SD_HOLDOUT_MASK) + if(sd.flag & SD_OBJECT_HOLDOUT_MASK) break; } #endif /* __HOLDOUT__ */ |