diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-09-12 11:33:46 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-09-12 11:33:46 +0300 |
| commit | 467d92b8f1c7231eb801194a94cbaeb75c4d5eab (patch) | |
| tree | a975d3fcfd71805fd96c2cf4ad4e5f66358ddbb9 /intern/cycles/kernel/closure | |
| parent | b07ee4e3a5ffa2b28dbd1add7b61d44fc1f2f482 (diff) | |
Cycles: Tweaks to avoid compilation error of megakernel
Also moved code out of deep-inside ifdef block, otherwise it was quite confusing.
Diffstat (limited to 'intern/cycles/kernel/closure')
| -rw-r--r-- | intern/cycles/kernel/closure/bssrdf.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/intern/cycles/kernel/closure/bssrdf.h b/intern/cycles/kernel/closure/bssrdf.h index f733ea4c517..06221189060 100644 --- a/intern/cycles/kernel/closure/bssrdf.h +++ b/intern/cycles/kernel/closure/bssrdf.h @@ -348,8 +348,9 @@ ccl_device_inline Bssrdf *bssrdf_alloc(ShaderData *sd, float3 weight) { Bssrdf *bssrdf = (Bssrdf*)closure_alloc(sd, sizeof(Bssrdf), CLOSURE_NONE_ID, weight); - if(!bssrdf) + if(bssrdf == NULL) { return NULL; + } float sample_weight = fabsf(average(weight)); bssrdf->sample_weight = sample_weight; |