diff options
| author | Stefan Werner <stefan.werner@tangent-animation.com> | 2017-12-02 05:28:13 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-01-11 04:58:29 +0300 |
| commit | 25b794a39d8cff87b6df2338d020e8d4ba90eeef (patch) | |
| tree | 8a981b760e13061e8a8b9f142f2331822c73de2d /intern/cycles/kernel/kernel_camera.h | |
| parent | ac2ebf9c54a9081662ab17f04240c00d9e5ac799 (diff) | |
Cycles: support animated object scale in motion blur.
This was disabled previously due to CUDA compiler bugs, see T32900.
Differential Revision: https://developer.blender.org/D2937
Diffstat (limited to 'intern/cycles/kernel/kernel_camera.h')
| -rw-r--r-- | intern/cycles/kernel/kernel_camera.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/intern/cycles/kernel/kernel_camera.h b/intern/cycles/kernel/kernel_camera.h index 0df5217d97a..77e3446329a 100644 --- a/intern/cycles/kernel/kernel_camera.h +++ b/intern/cycles/kernel/kernel_camera.h @@ -95,11 +95,11 @@ ccl_device void camera_sample_perspective(KernelGlobals *kg, float raster_x, flo # ifdef __KERNEL_OPENCL__ const MotionTransform tfm = kernel_data.cam.motion; transform_motion_interpolate(&cameratoworld, - ((const DecompMotionTransform*)&tfm), + &tfm, ray->time); # else transform_motion_interpolate(&cameratoworld, - ((const DecompMotionTransform*)&kernel_data.cam.motion), + &kernel_data.cam.motion, ray->time); # endif } @@ -207,11 +207,11 @@ ccl_device void camera_sample_orthographic(KernelGlobals *kg, float raster_x, fl # ifdef __KERNEL_OPENCL__ const MotionTransform tfm = kernel_data.cam.motion; transform_motion_interpolate(&cameratoworld, - (const DecompMotionTransform*)&tfm, + &tfm, ray->time); # else transform_motion_interpolate(&cameratoworld, - (const DecompMotionTransform*)&kernel_data.cam.motion, + &kernel_data.cam.motion, ray->time); # endif } @@ -285,11 +285,11 @@ ccl_device_inline void camera_sample_panorama(KernelGlobals *kg, # ifdef __KERNEL_OPENCL__ const MotionTransform tfm = kernel_data.cam.motion; transform_motion_interpolate(&cameratoworld, - (const DecompMotionTransform*)&tfm, + &tfm, ray->time); # else transform_motion_interpolate(&cameratoworld, - (const DecompMotionTransform*)&kernel_data.cam.motion, + &kernel_data.cam.motion, ray->time); # endif } |