diff options
author | Mikhail Matrosov <ktdfly> | 2021-10-06 11:16:56 +0300 |
---|---|---|
committer | William Leeson <william@blender.org> | 2021-10-06 11:25:09 +0300 |
commit | ca0450feeffdb07eea11c17aa617bfd7b9a04913 (patch) | |
tree | 12794100153cbf61184d6dc6de102634227c6703 /intern/cycles/kernel/svm | |
parent | 85267ec1ae9edba1167b2f6248fbf7307ee73544 (diff) |
Fix T91064: Cycles low poly meshes having black edges when shade smoothed
Fixes:{T91064}
Caused by {rBcd118c5581f482afc8554ff88b5b6f3b552b1682}
- Applies `ensure_valid_reflection()` to the normal input on all BSDFs for CPU and GPU.
- This doesn't affect hair.
- Removes `ensure_valid_reflection()` from the output of Bump Map and Normal Map nodes for CPU/GPU as it is not needed.
- The fix doesn't touch OSL.
Reviewed By: brecht, leesonw
Maniphest Tasks: T91064
Differential Revision: https://developer.blender.org/D12403
Diffstat (limited to 'intern/cycles/kernel/svm')
-rw-r--r-- | intern/cycles/kernel/svm/svm_closure.h | 6 | ||||
-rw-r--r-- | intern/cycles/kernel/svm/svm_tex_coord.h | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/intern/cycles/kernel/svm/svm_closure.h b/intern/cycles/kernel/svm/svm_closure.h index e2f6dde4ace..3e0cbe3a483 100644 --- a/intern/cycles/kernel/svm/svm_closure.h +++ b/intern/cycles/kernel/svm/svm_closure.h @@ -85,6 +85,9 @@ ccl_device_noinline int svm_node_closure_bsdf( } float3 N = stack_valid(data_node.x) ? stack_load_float3(stack, data_node.x) : sd->N; + if (!(sd->type & PRIMITIVE_ALL_CURVE)) { + N = ensure_valid_reflection(sd->Ng, sd->I, N); + } float param1 = (stack_valid(param1_offset)) ? stack_load_float(stack, param1_offset) : __uint_as_float(node.z); @@ -166,6 +169,9 @@ ccl_device_noinline int svm_node_closure_bsdf( float3 clearcoat_normal = stack_valid(data_cn_ssr.x) ? stack_load_float3(stack, data_cn_ssr.x) : sd->N; + if (!(sd->type & PRIMITIVE_ALL_CURVE)) { + clearcoat_normal = ensure_valid_reflection(sd->Ng, sd->I, clearcoat_normal); + } float3 subsurface_radius = stack_valid(data_cn_ssr.y) ? stack_load_float3(stack, data_cn_ssr.y) : make_float3(1.0f, 1.0f, 1.0f); diff --git a/intern/cycles/kernel/svm/svm_tex_coord.h b/intern/cycles/kernel/svm/svm_tex_coord.h index a35253080da..8869001015b 100644 --- a/intern/cycles/kernel/svm/svm_tex_coord.h +++ b/intern/cycles/kernel/svm/svm_tex_coord.h @@ -347,8 +347,6 @@ ccl_device_noinline void svm_node_normal_map(const KernelGlobals *kg, N = safe_normalize(sd->N + (N - sd->N) * strength); } - N = ensure_valid_reflection(sd->Ng, sd->I, N); - if (is_zero(N)) { N = sd->N; } |