diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2017-08-21 08:41:03 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2017-08-21 08:41:03 +0300 |
| commit | 3e555d3d785b17bf9398d7666d5131c994da8c6b (patch) | |
| tree | d15aaa353e31ed2acbd105d2b48ac4b1c99ea1e5 /intern/cycles/kernel/kernel_bake.h | |
| parent | d007828ae78d66cdcc005d9ba3ad57e987f0190a (diff) | |
| parent | 0033f0e161d984b38d3a36d18448f16baef121aa (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'intern/cycles/kernel/kernel_bake.h')
| -rw-r--r-- | intern/cycles/kernel/kernel_bake.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/intern/cycles/kernel/kernel_bake.h b/intern/cycles/kernel/kernel_bake.h index ea30ee9c139..d9b803cf692 100644 --- a/intern/cycles/kernel/kernel_bake.h +++ b/intern/cycles/kernel/kernel_bake.h @@ -342,8 +342,8 @@ ccl_device void kernel_bake_evaluate(KernelGlobals *kg, ccl_global uint4 *input, shader_eval_surface(kg, &sd, &state, 0.f, 0, SHADER_CONTEXT_MAIN); } - /* compression: normal = (2 * color) - 1 */ - out = sd.N * 0.5f + make_float3(0.5f, 0.5f, 0.5f); + /* encoding: normal = (2 * color) - 1 */ + out = shader_bsdf_average_normal(kg, &sd) * 0.5f + make_float3(0.5f, 0.5f, 0.5f); break; } case SHADER_EVAL_UV: |