diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-12-21 13:17:34 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-12-21 13:17:34 +0300 |
| commit | 9f0d067c2e9c8dcb4c40b880b0bbcf8ad31b1f55 (patch) | |
| tree | 33a66b8fa1aa6a4cd76b64e835819743ff05a9fa /intern | |
| parent | e3ef782af5d5255093d00cdc261d93dd3d8a5c40 (diff) | |
| parent | f6b2fbb02922e9c303b95ffbdd93cd047a640338 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/cycles/device/device_cuda.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/intern/cycles/device/device_cuda.cpp b/intern/cycles/device/device_cuda.cpp index 2e5f47002e8..47c09dfebf9 100644 --- a/intern/cycles/device/device_cuda.cpp +++ b/intern/cycles/device/device_cuda.cpp @@ -1372,8 +1372,8 @@ public: void *args[] = {&task->render_buffer.samples, &task->tiles_mem.device_pointer, - &mean_offset, - &variance_offset, + &mean_offset, + &variance_offset, &mean_ptr, &variance_ptr, &task->rect, |