[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [51453] trunk/blender/intern/cycles/kernel : Cycles: disable motion blur for CUDA entirely now, also goes wrong on other

[Brecht Van Lommel]

Revision: 51453
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=51453
Author:   blendix
Date:     2012-10-20 15:09:27 +0000 (Sat, 20 Oct 2012)
Log Message:
-----------
Cycles: disable motion blur for CUDA entirely now, also goes wrong on other
architectures. Still did not find a good solution.

Modified Paths:
--------------
    trunk/blender/intern/cycles/kernel/kernel_bvh.h
    trunk/blender/intern/cycles/kernel/kernel_types.h

Modified: trunk/blender/intern/cycles/kernel/kernel_bvh.h
===================================================================
--- trunk/blender/intern/cycles/kernel/kernel_bvh.h	2012-10-20 14:16:56 UTC (rev 51452)
+++ trunk/blender/intern/cycles/kernel/kernel_bvh.h	2012-10-20 15:09:27 UTC (rev 51453)
@@ -444,18 +444,13 @@
 __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
 }
 
 __device_inline float3 ray_offset(float3 P, float3 Ng)

Modified: trunk/blender/intern/cycles/kernel/kernel_types.h
===================================================================
--- trunk/blender/intern/cycles/kernel/kernel_types.h	2012-10-20 14:16:56 UTC (rev 51452)
+++ trunk/blender/intern/cycles/kernel/kernel_types.h	2012-10-20 15:09:27 UTC (rev 51453)
@@ -109,9 +109,13 @@
 #define __BACKGROUND_MIS__
 #define __AO__
 #define __CAMERA_MOTION__
+
+#ifndef __KERNEL_CUDA__
 #define __OBJECT_MOTION__
 #endif
 
+#endif
+
 //#define __SOBOL_FULL_SCREEN__
 
 /* Shader Evaluation */