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
path: root/intern
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2016-05-24 18:02:19 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2016-05-24 18:02:19 +0300
commit18b418e8e01b7d91da0240f0c5fc4370d4c4f6d9 (patch)
tree045219937564c4bf6f4b546e9e7eeb2eb71002cc /intern
parentdc5a6a0aed682d7d11fdfd0a2616d2558b0c521d (diff)
Cycles: Fix wrong cuda textures limits
Diffstat (limited to 'intern')
-rw-r--r--intern/cycles/render/image.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/intern/cycles/render/image.cpp b/intern/cycles/render/image.cpp
index ea18419742f..32db5d7d10e 100644
--- a/intern/cycles/render/image.cpp
+++ b/intern/cycles/render/image.cpp
@@ -60,8 +60,8 @@ ImageManager::ImageManager(const DeviceInfo& info)
tex_image_byte_start = TEX_IMAGE_BYTE_START_CPU;
}
/* CUDA */
- else if(device_type == DEVICE_CUDA && !info.has_bindless_textures) {
- if(info.has_bindless_textures) {
+ else if(device_type == DEVICE_CUDA) {
+ if(!info.has_bindless_textures) {
/* Fermi */
tex_num_images[IMAGE_DATA_TYPE_BYTE4] = TEX_NUM_BYTE4_IMAGES_CUDA_KEPLER;
tex_num_images[IMAGE_DATA_TYPE_FLOAT4] = TEX_NUM_FLOAT4_IMAGES_CUDA_KEPLER;