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_object.h | |
| parent | 6c4ddfc5d9833b6c4f0ae3da93645556fee97caf (diff) | |
Code refactor: motion blur cleanups, preparing for next commit.
Diffstat (limited to 'intern/cycles/kernel/geom/geom_object.h')
| -rw-r--r-- | intern/cycles/kernel/geom/geom_object.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/intern/cycles/kernel/geom/geom_object.h b/intern/cycles/kernel/geom/geom_object.h index 62bc46dc21b..a7191c50e97 100644 --- a/intern/cycles/kernel/geom/geom_object.h +++ b/intern/cycles/kernel/geom/geom_object.h @@ -32,8 +32,8 @@ enum ObjectTransform { }; enum ObjectVectorTransform { - OBJECT_VECTOR_MOTION_PRE = 0, - OBJECT_VECTOR_MOTION_POST = 1 + OBJECT_PASS_MOTION_PRE = 0, + OBJECT_PASS_MOTION_POST = 1 }; /* Object to world space transformation */ @@ -68,10 +68,10 @@ ccl_device_inline Transform lamp_fetch_transform(KernelGlobals *kg, int lamp, bo /* Object to world space transformation for motion vectors */ -ccl_device_inline Transform object_fetch_vector_transform(KernelGlobals *kg, int object, enum ObjectVectorTransform type) +ccl_device_inline Transform object_fetch_motion_pass_transform(KernelGlobals *kg, int object, enum ObjectVectorTransform type) { - int offset = object*OBJECT_VECTOR_SIZE + (int)type; - return kernel_tex_fetch(__objects_vector, offset); + int offset = object*OBJECT_MOTION_PASS_SIZE + (int)type; + return kernel_tex_fetch(__object_motion_pass, offset); } /* Motion blurred object transformations */ |