diff options
| author | Thomas Dinges <blender@dingto.org> | 2016-05-17 01:37:34 +0300 |
|---|---|---|
| committer | Thomas Dinges <blender@dingto.org> | 2016-05-17 01:37:34 +0300 |
| commit | 29a17d54da1f4b85a59487e032165bb44dc1b065 (patch) | |
| tree | eb14e5529967a2db65f73eaf51b9b42b3e77518f | |
| parent | 99d861169f8c9ebee236ddde6dbf27866d7acb64 (diff) | |
Fix CUDA MEMCPY condition, it should only copy 3D, 2D or 1D.
Found by Brecht, thanks!
| -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 69015e7401b..12c62c0702c 100644 --- a/intern/cycles/device/device_cuda.cpp +++ b/intern/cycles/device/device_cuda.cpp @@ -562,7 +562,7 @@ public: cuda_assert(cuMemcpy3D(¶m)); } - if(mem.data_height > 1) { + else if(mem.data_height > 1) { CUDA_MEMCPY2D param; memset(¶m, 0, sizeof(param)); param.dstMemoryType = CU_MEMORYTYPE_ARRAY; |