diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-10-20 19:09:27 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-10-20 19:09:27 +0400 |
| commit | e287c97fea74debb88b73de695b155fb172fa7c6 (patch) | |
| tree | f3efc9f3a96b8f4acdc367c2518fcab546909fcc | |
| parent | 18fa7589ef2892236dbc5320767956f34a4a98db (diff) | |
Cycles: disable motion blur for CUDA entirely now, also goes wrong on other
architectures. Still did not find a good solution.
| -rw-r--r-- | intern/cycles/kernel/kernel_bvh.h | 5 | ||||
| -rw-r--r-- | intern/cycles/kernel/kernel_types.h | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/intern/cycles/kernel/kernel_bvh.h b/intern/cycles/kernel/kernel_bvh.h index e3c8b796e9c..d70485fd6cf 100644 --- a/intern/cycles/kernel/kernel_bvh.h +++ b/intern/cycles/kernel/kernel_bvh.h @@ -444,16 +444,11 @@ __device_inline bool bvh_intersect_motion(KernelGlobals *kg, const Ray *ray, con __device_inline bool scene_intersect(KernelGlobals *kg, const Ray *ray, const uint visibility, Intersection *isect) { #ifdef __OBJECT_MOTION__ -#if !defined(__KERNEL_CUDA__) || (__CUDA_ARCH__ >= 210) if(kernel_data.bvh.have_motion) return bvh_intersect_motion(kg, ray, visibility, isect); else return bvh_intersect(kg, ray, visibility, isect); #else - /* todo: fix cuda sm 2.0 motion blur */ - return bvh_intersect(kg, ray, visibility, isect); -#endif -#else return bvh_intersect(kg, ray, visibility, isect); #endif } diff --git a/intern/cycles/kernel/kernel_types.h b/intern/cycles/kernel/kernel_types.h index c341269f4ca..94a55738f2b 100644 --- a/intern/cycles/kernel/kernel_types.h +++ b/intern/cycles/kernel/kernel_types.h @@ -109,9 +109,13 @@ CCL_NAMESPACE_BEGIN #define __BACKGROUND_MIS__ #define __AO__ #define __CAMERA_MOTION__ + +#ifndef __KERNEL_CUDA__ #define __OBJECT_MOTION__ #endif +#endif + //#define __SOBOL_FULL_SCREEN__ /* Shader Evaluation */ |