Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@pandora.be>2013-06-10 23:01:37 +0400
committerBrecht Van Lommel <brechtvanlommel@pandora.be>2013-06-10 23:01:37 +0400
commit2ce0ecd9563b6e209ff05cdeb7db5ddb6ffb7098 (patch)
tree7745b28038eeb4d63f76e08e050c62e23596be65
parent67a5d1b660a37a43f4d70fc7d588b67bef434574 (diff)
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.
-rw-r--r--intern/cycles/kernel/kernel_types.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/kernel/kernel_types.h b/intern/cycles/kernel/kernel_types.h
index 771c79ba637..9785f2e8320 100644
--- a/intern/cycles/kernel/kernel_types.h
+++ b/intern/cycles/kernel/kernel_types.h
@@ -55,6 +55,7 @@ CCL_NAMESPACE_BEGIN
#define __OSL__
#endif
#define __SUBSURFACE__
+#define __CMJ__
#endif
#ifdef __KERNEL_CUDA__
@@ -117,7 +118,6 @@ CCL_NAMESPACE_BEGIN
#define __CAMERA_CLIPPING__
#define __INTERSECTION_REFINE__
#define __CLAMP_SAMPLE__
-#define __CMJ__
#ifdef __KERNEL_SHADING__
#define __SVM__