Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@gmail.com>2018-03-08 08:19:17 +0300
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2018-03-10 06:54:05 +0300
commit623141f339d5066ed6b96ad70ab45fb294e3e612 (patch)
tree4af00e5d967a66829db1bec4bbf369c0529b9bd7 /intern/cycles/kernel/kernel_camera.h
parent516e82a90012da3911518103829158215d94215f (diff)
Code refactor: add DecomposedTransform.
This is in preparation of making Transform affine only, and also gives us a little extra type safety so we don't accidentally treat it as a regular 4x4 matrix.
Diffstat (limited to 'intern/cycles/kernel/kernel_camera.h')
-rw-r--r--intern/cycles/kernel/kernel_camera.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/intern/cycles/kernel/kernel_camera.h b/intern/cycles/kernel/kernel_camera.h
index 5b102eabb93..755c3472072 100644
--- a/intern/cycles/kernel/kernel_camera.h
+++ b/intern/cycles/kernel/kernel_camera.h
@@ -92,7 +92,7 @@ ccl_device void camera_sample_perspective(KernelGlobals *kg, float raster_x, flo
#ifdef __CAMERA_MOTION__
if(kernel_data.cam.have_motion) {
- ccl_constant MotionTransform *motion = &kernel_data.cam.motion;
+ ccl_constant DecomposedMotionTransform *motion = &kernel_data.cam.motion;
transform_motion_interpolate_constant(&cameratoworld,
motion,
ray->time);
@@ -198,7 +198,7 @@ ccl_device void camera_sample_orthographic(KernelGlobals *kg, float raster_x, fl
#ifdef __CAMERA_MOTION__
if(kernel_data.cam.have_motion) {
- ccl_constant MotionTransform *motion = &kernel_data.cam.motion;
+ ccl_constant DecomposedMotionTransform *motion = &kernel_data.cam.motion;
transform_motion_interpolate_constant(&cameratoworld,
motion,
ray->time);
@@ -270,7 +270,7 @@ ccl_device_inline void camera_sample_panorama(ccl_constant KernelCamera *cam,
#ifdef __CAMERA_MOTION__
if(cam->have_motion) {
- ccl_constant MotionTransform *motion = &cam->motion;
+ ccl_constant DecomposedMotionTransform *motion = &cam->motion;
transform_motion_interpolate_constant(&cameratoworld,
motion,
ray->time);