[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [57360] trunk/blender/intern/cycles/kernel /kernel_types.h: Attempt to fix #35665: disable correlated multi jitter sampling on the GPU for now,

[Brecht Van Lommel]

Revision: 57360
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57360
Author:   blendix
Date:     2013-06-10 19:01:37 +0000 (Mon, 10 Jun 2013)
Log Message:
-----------
Attempt to fix #35665: disable correlated multi jitter sampling on the GPU for now,
seems to be giving issues with CUDA 4.2 but I can't figure out why exactly.

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

Modified: trunk/blender/intern/cycles/kernel/kernel_types.h
===================================================================
--- trunk/blender/intern/cycles/kernel/kernel_types.h	2013-06-10 18:12:07 UTC (rev 57359)
+++ trunk/blender/intern/cycles/kernel/kernel_types.h	2013-06-10 19:01:37 UTC (rev 57360)
@@ -55,6 +55,7 @@
 #define __OSL__
 #endif
 #define __SUBSURFACE__
+#define __CMJ__
 #endif
 
 #ifdef __KERNEL_CUDA__
@@ -117,7 +118,6 @@
 #define __CAMERA_CLIPPING__
 #define __INTERSECTION_REFINE__
 #define __CLAMP_SAMPLE__
-#define __CMJ__
 
 #ifdef __KERNEL_SHADING__
 #define __SVM__