diff options
| author | Patrick Mours <pmours@nvidia.com> | 2020-01-14 19:49:04 +0300 |
|---|---|---|
| committer | Patrick Mours <pmours@nvidia.com> | 2020-01-14 19:49:04 +0300 |
| commit | 2a638e8c90839ec5c95288240d2114b12a33b8f4 (patch) | |
| tree | 326cd9920f860c0b2a1708cf4b7683aba5a66e3b /intern/cycles/device | |
| parent | 52c96b60a00542401afe51c720d4b67d07826f6b (diff) | |
| parent | ff430dea663521f742ff2f8f79b5d7f4978ecc04 (diff) | |
Merge branch 'blender-v2.82-release'
Diffstat (limited to 'intern/cycles/device')
| -rw-r--r-- | intern/cycles/device/device_optix.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/intern/cycles/device/device_optix.cpp b/intern/cycles/device/device_optix.cpp index 0a79bd1232b..6306f747b33 100644 --- a/intern/cycles/device/device_optix.cpp +++ b/intern/cycles/device/device_optix.cpp @@ -1432,6 +1432,8 @@ class OptiXDevice : public Device { size_t motion_transform_size = sizeof(OptixSRTMotionTransform) + motion_keys * sizeof(OptixSRTData); + const CUDAContextScope scope(cuda_context); + CUdeviceptr motion_transform_gpu = 0; check_result_cuda_ret(cuMemAlloc(&motion_transform_gpu, motion_transform_size)); as_mem.push_back(motion_transform_gpu); |