diff options
| author | Martijn Berger <martijn.berger@gmail.com> | 2014-03-19 10:36:34 +0400 |
|---|---|---|
| committer | Martijn Berger <martijn.berger@gmail.com> | 2014-03-19 10:37:18 +0400 |
| commit | 28c1a860e20085afa49ecd79777f45e93a8eebff (patch) | |
| tree | 4e4de131deb514e2aaf6870a01936758f6594fca /intern | |
| parent | a91247c2b4702cbdd423fb5526c2f5a8d04c65d8 (diff) | |
Fix T39247
Changes to interpolation break texture allocation on sm35 and greater.
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/cycles/device/device_cuda.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/device/device_cuda.cpp b/intern/cycles/device/device_cuda.cpp index 5133a5c9fea..f3f6344521b 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) { |