[Bf-blender-cvs] [18b418e] master: Cycles: Fix wrong cuda textures limits

[Sergey Sharybin]

Commit: 18b418e8e01b7d91da0240f0c5fc4370d4c4f6d9
Author: Sergey Sharybin
Date:   Tue May 24 17:02:19 2016 +0200
Branches: master
https://developer.blender.org/rB18b418e8e01b7d91da0240f0c5fc4370d4c4f6d9

Cycles: Fix wrong cuda textures limits

===================================================================

M       intern/cycles/render/image.cpp

===================================================================

diff --git a/intern/cycles/render/image.cpp b/intern/cycles/render/image.cpp
index ea18419..32db5d7 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;

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs