diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-09-19 19:42:17 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-09-19 19:42:17 +0300 |
| commit | a53c81c60b69754408d9ada74677d24baa3aa1bb (patch) | |
| tree | 5f9350090c2d589560d31829bdcef564b9cb45c3 /intern/cycles/device/device_cuda.cpp | |
| parent | 6b433f4eb3da0acf092fb4e5417b10f9b304d073 (diff) | |
| parent | a5101e4da8d81161482106d8d8d46ae49be6e18c (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'intern/cycles/device/device_cuda.cpp')
| -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 830cc207d54..2af8a9f48c8 100644 --- a/intern/cycles/device/device_cuda.cpp +++ b/intern/cycles/device/device_cuda.cpp @@ -1667,7 +1667,7 @@ public: for(int sample = start_sample; sample < end_sample; sample += step_samples) { /* Setup and copy work tile to device. */ wtile->start_sample = sample; - wtile->num_samples = min(step_samples, end_sample - sample);; + wtile->num_samples = min(step_samples, end_sample - sample); work_tiles.copy_to_device(); CUdeviceptr d_work_tiles = cuda_device_ptr(work_tiles.device_pointer); |