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/render/image.cpp
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/render/image.cpp')
-rw-r--r--intern/cycles/render/image.cpp2
1 files changed, 1 insertions, 1 deletions
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;