diff options
| author | Jacques Lucke <jacques@blender.org> | 2022-02-22 17:13:27 +0300 |
|---|---|---|
| committer | Jacques Lucke <jacques@blender.org> | 2022-02-22 17:13:27 +0300 |
| commit | 472ddc6e2787e73e4c7c7def62ac3b31822bbbf5 (patch) | |
| tree | 862ced607df59c376c42ba8038bcd66291b34b77 /intern | |
| parent | 9d8af55eb8daed365cc3360dc0e122ba91a9b9a6 (diff) | |
| parent | 1d4037645fb5467f71258883b12dc734532cde44 (diff) | |
Merge branch 'blender-v3.1-release'
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/cycles/device/cpu/device_impl.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/device/cpu/device_impl.cpp b/intern/cycles/device/cpu/device_impl.cpp index 158a789db5a..612c391f7d5 100644 --- a/intern/cycles/device/cpu/device_impl.cpp +++ b/intern/cycles/device/cpu/device_impl.cpp @@ -191,7 +191,7 @@ device_ptr CPUDevice::mem_alloc_sub_ptr(device_memory &mem, size_t offset, size_ void CPUDevice::const_copy_to(const char *name, void *host, size_t size) { -#if WITH_EMBREE +#ifdef WITH_EMBREE if (strcmp(name, "__data") == 0) { assert(size <= sizeof(KernelData)); |