diff options
Diffstat (limited to 'intern/cycles/kernel/kernel_bake.h')
| -rw-r--r-- | intern/cycles/kernel/kernel_bake.h | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/intern/cycles/kernel/kernel_bake.h b/intern/cycles/kernel/kernel_bake.h index bfbf73df54f..fd9207fd69f 100644 --- a/intern/cycles/kernel/kernel_bake.h +++ b/intern/cycles/kernel/kernel_bake.h @@ -41,7 +41,7 @@ ccl_device_inline void compute_light_pass(KernelGlobals *kg, ray.D = -sd->Ng; ray.t = FLT_MAX; #ifdef __CAMERA_MOTION__ - ray.time = TIME_INVALID; + ray.time = 0.5f; #endif /* init radiance */ @@ -313,15 +313,14 @@ ccl_device void kernel_bake_evaluate(KernelGlobals *kg, ccl_global uint4 *input, triangle_point_normal(kg, object, prim, u, v, &P, &Ng, &shader); - /* dummy initilizations copied from SHADER_EVAL_DISPLACE */ - float3 I = Ng; - float t = 1.0f; - float time = TIME_INVALID; - /* light passes */ PathRadiance L; - shader_setup_from_sample(kg, &sd, P, Ng, I, shader, object, prim, u, v, t, time); + shader_setup_from_sample(kg, &sd, + P, Ng, Ng, + shader, object, prim, + u, v, 1.0f, 0.5f, + !(kernel_tex_fetch(__object_flag, object) & SD_TRANSFORM_APPLIED)); sd.I = sd.N; /* update differentials */ @@ -525,6 +524,8 @@ ccl_device void kernel_shader_evaluate(KernelGlobals *kg, float3 P = sd.P; shader_eval_displacement(kg, &sd, &state, SHADER_CONTEXT_MAIN); out = sd.P - P; + + object_inverse_dir_transform(kg, &sd, &out); } else { // SHADER_EVAL_BACKGROUND /* setup ray */ |