From 94f869a256be307ad68e1c2265f68d760232e9b7 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Tue, 9 Oct 2012 18:37:14 +0000 Subject: Cycles: camera motion blur enabled. Still more work needed to get object motion blur ready. --- intern/cycles/kernel/kernel_types.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'intern/cycles/kernel/kernel_types.h') diff --git a/intern/cycles/kernel/kernel_types.h b/intern/cycles/kernel/kernel_types.h index 48e271a9f3f..b290d4c42d9 100644 --- a/intern/cycles/kernel/kernel_types.h +++ b/intern/cycles/kernel/kernel_types.h @@ -108,7 +108,8 @@ CCL_NAMESPACE_BEGIN #define __PASSES__ #define __BACKGROUND_MIS__ #define __AO__ -//#define __MOTION__ +#define __CAMERA_MOTION__ +//#define __OBJECT_MOTION__ #endif //#define __SOBOL_FULL_SCREEN__ @@ -129,7 +130,7 @@ enum PathTraceDimension { PRNG_FILTER_V = 1, PRNG_LENS_U = 2, PRNG_LENS_V = 3, -#ifdef __MOTION__ +#ifdef __CAMERA_MOTION__ PRNG_TIME = 4, PRNG_UNUSED = 5, PRNG_BASE_NUM = 6, @@ -426,7 +427,7 @@ typedef struct ShaderData { /* length of the ray being shaded */ float ray_length; -#ifdef __MOTION__ +#ifdef __OBJECT_MOTION__ /* object <-> world space transformations, cached to avoid * re-interpolating them constantly for shading */ Transform ob_tfm; -- cgit v1.2.3