diff options
| -rw-r--r-- | intern/cycles/kernel/kernel_globals.h | 4 | ||||
| -rw-r--r-- | intern/cycles/render/image.cpp | 2 | ||||
| -rw-r--r-- | intern/cycles/render/image.h | 4 |
3 files changed, 5 insertions, 5 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]; diff --git a/intern/cycles/render/image.cpp b/intern/cycles/render/image.cpp index dcb28455e4a..91aae6f3ec3 100644 --- a/intern/cycles/render/image.cpp +++ b/intern/cycles/render/image.cpp @@ -170,7 +170,7 @@ int ImageManager::add_image(const string& filename, void *builtin_data, bool ani if(slot == float_images.size()) { /* max images limit reached */ - if(float_images.size() == TEX_NUM_FLOAT_IMAGES) { + if(float_images.size() == tex_num_float_images) { printf("ImageManager::add_image: float image limit reached %d, skipping '%s'\n", tex_num_float_images, filename.c_str()); return -1; diff --git a/intern/cycles/render/image.h b/intern/cycles/render/image.h index f7be5458d49..187c5fd0f02 100644 --- a/intern/cycles/render/image.h +++ b/intern/cycles/render/image.h @@ -30,8 +30,8 @@ CCL_NAMESPACE_BEGIN #define TEX_NUM_IMAGES 95 #define TEX_IMAGE_BYTE_START TEX_NUM_FLOAT_IMAGES -#define TEX_EXTENDED_NUM_FLOAT_IMAGES 5 -#define TEX_EXTENDED_NUM_IMAGES 512 +#define TEX_EXTENDED_NUM_FLOAT_IMAGES 1024 +#define TEX_EXTENDED_NUM_IMAGES 1024 #define TEX_EXTENDED_IMAGE_BYTE_START TEX_EXTENDED_NUM_FLOAT_IMAGES /* color to use when textures are not found */ |