diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-01-12 00:25:40 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-01-12 00:30:31 +0300 |
| commit | 2dbcc17897f18090440ad0756fbc35210a01c9b8 (patch) | |
| tree | 98d5a828a816f0cea3913bdd0e5ab0a735c0a241 /intern/cycles/kernel/svm/svm_bevel.h | |
| parent | 6b3d85fa51f376b282dfa2fd648dab2c902c554b (diff) | |
Fix Cycles bevel normal baking having some random incorrect pixels.
The bevel and SSS code could result in NaNs in some cases, tweak the
formulas so this can't happen.
Diffstat (limited to 'intern/cycles/kernel/svm/svm_bevel.h')
| -rw-r--r-- | intern/cycles/kernel/svm/svm_bevel.h | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/intern/cycles/kernel/svm/svm_bevel.h b/intern/cycles/kernel/svm/svm_bevel.h index bbbc8dce2cf..dcfe4ad71b8 100644 --- a/intern/cycles/kernel/svm/svm_bevel.h +++ b/intern/cycles/kernel/svm/svm_bevel.h @@ -174,18 +174,17 @@ ccl_device_noinline float3 svm_bevel( float pdf_B = pick_pdf_B * fabsf(dot(disk_B, hit_Ng)); /* Multiple importance sample between 3 axes, power heuristic - * found to be slightly better than balance heuristic. */ - float mis_weight = power_heuristic_3(pdf_N, pdf_T, pdf_B); + * found to be slightly better than balance heuristic. pdf_N + * in the MIS weight and denominator cancelled out. */ + float w = pdf_N / (sqr(pdf_N) + sqr(pdf_T) + sqr(pdf_B)); + if(isect.num_hits > LOCAL_MAX_HITS) { + w *= isect.num_hits/(float)LOCAL_MAX_HITS; + } /* Real distance to sampled point. */ float r = len(hit_P - sd->P); /* Compute weight. */ - float w = mis_weight / pdf_N; - if(isect.num_hits > LOCAL_MAX_HITS) { - w *= isect.num_hits/(float)LOCAL_MAX_HITS; - } - float pdf = bssrdf_cubic_pdf(radius, 0.0f, r); float disk_pdf = bssrdf_cubic_pdf(radius, 0.0f, disk_r); |