diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2019-11-07 13:12:44 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2019-11-07 13:12:44 +0300 |
| commit | 4ab0b2b5aad9f1a6f23ee501bb577227706eb367 (patch) | |
| tree | 1426d89fb632471b94ff3bf56591437944d50118 /intern | |
| parent | 322cec8e4d16340a7b167066c6ba2eb6c2a19b8e (diff) | |
| parent | aa2904ea13b5aa72c5eba0c9e094ad8fc4937990 (diff) | |
Merge branch 'blender-v2.81-release'
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/cycles/device/device_optix.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/device/device_optix.cpp b/intern/cycles/device/device_optix.cpp index 3162b72a0dc..831cd8c3148 100644 --- a/intern/cycles/device/device_optix.cpp +++ b/intern/cycles/device/device_optix.cpp @@ -1189,7 +1189,7 @@ class OptiXDevice : public Device { size_t bytes = 0; CUdeviceptr mem = 0; check_result_cuda(cuModuleGetGlobal(&mem, &bytes, cuda_module, name)); - assert(mem != NULL && bytes == data_size); + assert(mem != 0 && bytes == data_size); check_result_cuda(cuMemcpyHtoD(mem, data, data_size)); } |