diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-03-10 02:37:07 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-03-10 06:54:05 +0300 |
| commit | 267d8923265a284c5d9a462e1d86305d613fcad8 (patch) | |
| tree | 7e0bd31d403a4d878ec65aaac3883bbfea67cc20 /intern/cycles/kernel/geom/geom_primitive.h | |
| parent | 6c4ddfc5d9833b6c4f0ae3da93645556fee97caf (diff) | |
Code refactor: motion blur cleanups, preparing for next commit.
Diffstat (limited to 'intern/cycles/kernel/geom/geom_primitive.h')
| -rw-r--r-- | intern/cycles/kernel/geom/geom_primitive.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/intern/cycles/kernel/geom/geom_primitive.h b/intern/cycles/kernel/geom/geom_primitive.h index 4e84446bae0..c159be92885 100644 --- a/intern/cycles/kernel/geom/geom_primitive.h +++ b/intern/cycles/kernel/geom/geom_primitive.h @@ -193,10 +193,10 @@ ccl_device_inline float4 primitive_motion_vector(KernelGlobals *kg, ShaderData * * transformation was set match the world/object space of motion_pre/post */ Transform tfm; - tfm = object_fetch_vector_transform(kg, sd->object, OBJECT_VECTOR_MOTION_PRE); + tfm = object_fetch_motion_pass_transform(kg, sd->object, OBJECT_PASS_MOTION_PRE); motion_pre = transform_point(&tfm, motion_pre); - tfm = object_fetch_vector_transform(kg, sd->object, OBJECT_VECTOR_MOTION_POST); + tfm = object_fetch_motion_pass_transform(kg, sd->object, OBJECT_PASS_MOTION_POST); motion_post = transform_point(&tfm, motion_post); float3 motion_center; @@ -207,10 +207,10 @@ ccl_device_inline float4 primitive_motion_vector(KernelGlobals *kg, ShaderData * ProjectionTransform projection = kernel_data.cam.worldtoraster; motion_center = transform_perspective(&projection, center); - projection = kernel_data.cam.perspective_motion.pre; + projection = kernel_data.cam.perspective_pre; motion_pre = transform_perspective(&projection, motion_pre); - projection = kernel_data.cam.perspective_motion.post; + projection = kernel_data.cam.perspective_post; motion_post = transform_perspective(&projection, motion_post); } else { @@ -220,13 +220,13 @@ ccl_device_inline float4 primitive_motion_vector(KernelGlobals *kg, ShaderData * motion_center.x *= kernel_data.cam.width; motion_center.y *= kernel_data.cam.height; - tfm = kernel_data.cam.pass_motion.pre; + tfm = kernel_data.cam.motion_pass_pre; motion_pre = normalize(transform_point(&tfm, motion_pre)); motion_pre = float2_to_float3(direction_to_panorama(&kernel_data.cam, motion_pre)); motion_pre.x *= kernel_data.cam.width; motion_pre.y *= kernel_data.cam.height; - tfm = kernel_data.cam.pass_motion.post; + tfm = kernel_data.cam.motion_pass_post; motion_post = normalize(transform_point(&tfm, motion_post)); motion_post = float2_to_float3(direction_to_panorama(&kernel_data.cam, motion_post)); motion_post.x *= kernel_data.cam.width; |