[Bf-blender-cvs] [28c1a86] master: Fix T39247

[Martijn Berger]

Commit: 28c1a860e20085afa49ecd79777f45e93a8eebff
Author: Martijn Berger
Date:   Wed Mar 19 07:36:34 2014 +0100
https://developer.blender.org/rB28c1a860e20085afa49ecd79777f45e93a8eebff

Fix T39247

Changes to interpolation break texture allocation on sm35 and greater.

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

M	intern/cycles/device/device_cuda.cpp

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

diff --git a/intern/cycles/device/device_cuda.cpp b/intern/cycles/device/device_cuda.cpp
index 5133a5c..f3f6344 100644
--- a/intern/cycles/device/device_cuda.cpp
+++ b/intern/cycles/device/device_cuda.cpp
@@ -457,7 +457,7 @@ public:
 		CUarray_format_enum format;
 		size_t dsize = datatype_size(mem.data_type);
 		size_t size = mem.memory_size();
-		bool use_texture = interpolation || use_texture_storage;
+		bool use_texture = (interpolation != INTERPOLATION_NONE) || use_texture_storage;
 
 		if(use_texture) {