diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2014-06-09 14:38:46 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2014-06-09 14:40:13 +0400 |
| commit | 30c42d7353529daf32c216ef9a1694ac2b33cfc0 (patch) | |
| tree | d0326bd145c4757fb10de1de8450c105f8d20afb /intern/cycles/render/image.cpp | |
| parent | 30e7bdfe1067ea768f3d3019f28bcf957152c032 (diff) | |
Fix cycles CUDA error when trying to use >= 100 image textures.
Diffstat (limited to 'intern/cycles/render/image.cpp')
| -rw-r--r-- | intern/cycles/render/image.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/intern/cycles/render/image.cpp b/intern/cycles/render/image.cpp index 77cd6d5e79d..f45131051da 100644 --- a/intern/cycles/render/image.cpp +++ b/intern/cycles/render/image.cpp @@ -576,7 +576,8 @@ void ImageManager::device_load_image(Device *device, DeviceScene *dscene, int sl string name; - if(slot >= 10) name = string_printf("__tex_image_float_0%d", slot); + if(slot >= 100) name = string_printf("__tex_image_float_%d", slot); + else if(slot >= 10) name = string_printf("__tex_image_float_0%d", slot); else name = string_printf("__tex_image_float_00%d", slot); if(!pack_images) { @@ -607,7 +608,8 @@ void ImageManager::device_load_image(Device *device, DeviceScene *dscene, int sl string name; - if(slot >= 10) name = string_printf("__tex_image_0%d", slot); + if(slot >= 100) name = string_printf("__tex_image_%d", slot); + else if(slot >= 10) name = string_printf("__tex_image_0%d", slot); else name = string_printf("__tex_image_00%d", slot); if(!pack_images) { |