Merge branch 'blender-v2.81-release'

2019-11-07 11:12:44 +01:00 · 2019-11-07 11:12:44 +01:00 · 4ab0b2b5aa
parent 322cec8e4d aa2904ea13
commit 4ab0b2b5aa
1 changed files with 1 additions and 1 deletions
--- 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));
  }