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:
authorThomas Dinges <blender@dingto.org>2013-12-14 18:06:18 +0400
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2013-12-14 18:07:46 +0400
commit1bebdc9ad0b6174a9aee243ad37fcc20db23791c (patch)
treeb8c9c490da71d935792e7a591cd24743c59b0db0 /intern/cycles/kernel/kernel_globals.h
parent5fdfa6d47542db32426ac080f071a1fd751e05a7 (diff)
Fix T37264: cycles CPU render had limited number of float images, bumped to 1024.
GPU is still limited to 5, but there's no good reason for the CPU to be limited.
Diffstat (limited to 'intern/cycles/kernel/kernel_globals.h')
-rw-r--r--intern/cycles/kernel/kernel_globals.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/intern/cycles/kernel/kernel_globals.h b/intern/cycles/kernel/kernel_globals.h
index e60bd6c0067..6bd2ec0662c 100644
--- a/intern/cycles/kernel/kernel_globals.h
+++ b/intern/cycles/kernel/kernel_globals.h
@@ -31,8 +31,8 @@ struct OSLThreadData;
struct OSLShadingSystem;
#endif
-#define MAX_BYTE_IMAGES 512
-#define MAX_FLOAT_IMAGES 5
+#define MAX_BYTE_IMAGES 1024
+#define MAX_FLOAT_IMAGES 1024
typedef struct KernelGlobals {
texture_image_uchar4 texture_byte_images[MAX_BYTE_IMAGES];