From 013b46d6bda4388736d7953746d6b335ce495b16 Mon Sep 17 00:00:00 2001 From: Mai Lavelle Date: Fri, 2 Sep 2016 21:37:17 -0400 Subject: Cycles: Replace object index hack with actual checks for SD_TRANSFORM_APPLIED Using ones complement for detecting if transform has been applied was confusing and led to several bugs. With this proper checks are made. Also added a few transforms where they were missing, mostly affecting baking and displacement when `P` is used in the shader (previously `P` was in the wrong space for these shaders) Also removed `TIME_INVALID` as this may have resulted in incorrect transforms in some cases. Reviewed By: brecht Differential Revision: https://developer.blender.org/D2192 --- intern/cycles/kernel/kernel_camera.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'intern/cycles/kernel/kernel_camera.h') diff --git a/intern/cycles/kernel/kernel_camera.h b/intern/cycles/kernel/kernel_camera.h index 88514de514c..8e0aa678cac 100644 --- a/intern/cycles/kernel/kernel_camera.h +++ b/intern/cycles/kernel/kernel_camera.h @@ -321,7 +321,7 @@ ccl_device_inline void camera_sample(KernelGlobals *kg, #ifdef __CAMERA_MOTION__ /* motion blur */ if(kernel_data.cam.shuttertime == -1.0f) { - ray->time = TIME_INVALID; + ray->time = 0.5f; } else { /* TODO(sergey): Such lookup is unneeded when there's rolling shutter -- cgit v1.2.3