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>2012-11-29 04:43:50 +0400
committerBrecht Van Lommel <brechtvanlommel@pandora.be>2012-11-29 04:43:50 +0400
commit0d6976ad0ce4570e286ca33b852ee3b6a07a09ab (patch)
treebd8ec57a4c4454db097d06b5c1eea4328863753e /intern/cycles/kernel/kernel_types.h
parentbb0195e0396a66c40a03e9f9c6a87c9b8a5ecc47 (diff)
Fix #32900: object motion blur not working on the GPU. To make this work I disabled motion
blurring of scale animation, probably not a big loss in practice since it's not so common to animate this, can be added back later.
Diffstat (limited to 'intern/cycles/kernel/kernel_types.h')
-rw-r--r--intern/cycles/kernel/kernel_types.h6
1 files changed, 1 insertions, 5 deletions
diff --git a/intern/cycles/kernel/kernel_types.h b/intern/cycles/kernel/kernel_types.h
index 977fb8c4fd4..a7bf6b28e7e 100644
--- a/intern/cycles/kernel/kernel_types.h
+++ b/intern/cycles/kernel/kernel_types.h
@@ -29,7 +29,7 @@
CCL_NAMESPACE_BEGIN
/* constants */
-#define OBJECT_SIZE 22
+#define OBJECT_SIZE 18
#define LIGHT_SIZE 4
#define FILTER_TABLE_SIZE 256
#define RAMP_TABLE_SIZE 256
@@ -112,13 +112,9 @@ CCL_NAMESPACE_BEGIN
#define __AO__
#define __CAMERA_MOTION__
#define __ANISOTROPIC__
-
-#ifndef __KERNEL_CUDA__
#define __OBJECT_MOTION__
#endif
-#endif
-
//#define __SOBOL_FULL_SCREEN__
/* Shader Evaluation */