From 8c227adb8cf880a13081eac06f4c79c108e7bb5b Mon Sep 17 00:00:00 2001 From: Dalai Felinto Date: Tue, 11 Nov 2014 18:21:56 -0200 Subject: Fix T41783: Cycles baking ignores displacement Create unique flag for output shaders with displacement data and use it to calculate transformed normal. Implementation suggested by Brecht Van Lommel. Reviewers: brecht Differential Revision: https://developer.blender.org/D890 --- intern/cycles/kernel/kernel_bake.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'intern/cycles/kernel/kernel_bake.h') diff --git a/intern/cycles/kernel/kernel_bake.h b/intern/cycles/kernel/kernel_bake.h index 96be065f5d8..e80bfb32e89 100644 --- a/intern/cycles/kernel/kernel_bake.h +++ b/intern/cycles/kernel/kernel_bake.h @@ -253,6 +253,10 @@ ccl_device void kernel_bake_evaluate(KernelGlobals *kg, ccl_global uint4 *input, /* data passes */ case SHADER_EVAL_NORMAL: { + if ((sd.flag & SD_HAS_BUMP)) { + shader_eval_surface(kg, &sd, 0.f, 0, SHADER_CONTEXT_MAIN); + } + /* compression: normal = (2 * color) - 1 */ out = sd.N * 0.5f + make_float3(0.5f, 0.5f, 0.5f); break; -- cgit v1.2.3