Blender Git Commit Log

Git Commits -> Revision cf7343a

Revision cf7343a by Patrick Mours (master)
November 2, 2020, 17:00 (GMT)
Fix Cycles kernel compile error with NanoVDB because of type redefinition

Cycles defines some basic integer types since it cannot use the standard headers when
compiling with NVRTC. NanoVDB however only does this when the "__CUDACC_RTC__" define
is set and otherwise includes the standard "stdint.h" header which clashes with those typedefs.
So for compatibility do the same thing in the Cycles kernel headers. See also T81454.

Commit Details:

Full Hash: cf7343a35559c7fec2047c3e5d7ef4dd7c1e64a5
Parent Commit: 1408052
Lines Changed: +8, -0

2 Modified Paths:

/intern/cycles/kernel/kernel_compat_cuda.h (+4, -0) (Diff)
/intern/cycles/kernel/kernel_compat_optix.h (+4, -0) (Diff)
By: Miika HämäläinenLast update: Nov-07-2014 14:18MiikaHweb | 2003-2021