[Bf-blender-cvs] [84c7f42] master: Cycles: Yet another fix for textures limit

[Sergey Sharybin]

Commit: 84c7f427f228aadc2dd9e36e3935773aa3ecc25b
Author: Sergey Sharybin
Date:   Wed May 25 12:48:40 2016 +0200
Branches: master
https://developer.blender.org/rB84c7f427f228aadc2dd9e36e3935773aa3ecc25b

Cycles: Yet another fix for textures limit

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

M	intern/cycles/render/image.cpp

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

diff --git a/intern/cycles/render/image.cpp b/intern/cycles/render/image.cpp
index 32db5d7..a3d2d23 100644
--- a/intern/cycles/render/image.cpp
+++ b/intern/cycles/render/image.cpp
@@ -61,8 +61,8 @@ ImageManager::ImageManager(const DeviceInfo& info)
 	}
 	/* CUDA */
 	else if(device_type == DEVICE_CUDA) {
-		if(!info.has_bindless_textures) {
-			/* Fermi */
+		if(info.has_bindless_textures) {
+			/* Kepler and above */
 			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;
 			tex_num_images[IMAGE_DATA_TYPE_FLOAT] = TEX_NUM_FLOAT_IMAGES_CUDA_KEPLER;
@@ -72,7 +72,7 @@ ImageManager::ImageManager(const DeviceInfo& info)
 			tex_image_byte_start = TEX_IMAGE_BYTE_START_CUDA_KEPLER;
 		}
 		else {
-			/* Kepler and above */
+			/* Fermi */
 			tex_num_images[IMAGE_DATA_TYPE_BYTE4] = TEX_NUM_BYTE4_IMAGES_CUDA;
 			tex_num_images[IMAGE_DATA_TYPE_FLOAT4] = TEX_NUM_FLOAT4_IMAGES_CUDA;
 			tex_num_images[IMAGE_DATA_TYPE_FLOAT] = TEX_NUM_FLOAT_IMAGES_CUDA;