diff options
| author | Lukas Tönne <lukas.toenne@gmail.com> | 2022-07-26 00:43:48 +0300 |
|---|---|---|
| committer | Lukas Tönne <lukas.toenne@gmail.com> | 2022-07-26 00:43:48 +0300 |
| commit | f081e76037432cb926be45e980eac201d337032c (patch) | |
| tree | dd1225521c12ea21c0b0c3d51ec1ae3f8730755f /intern/cycles/kernel/device/oneapi/compat.h | |
| parent | fa2084ae58a77b1201289b6bedac427f73c762d1 (diff) | |
| parent | 462f99bf38648a08226b1fba423315aec2bc577b (diff) | |
Merge branch 'master' into geometry-nodes-iterative-cachegeometry-nodes-rigid-body-integration
Diffstat (limited to 'intern/cycles/kernel/device/oneapi/compat.h')
| -rw-r--r-- | intern/cycles/kernel/device/oneapi/compat.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/kernel/device/oneapi/compat.h b/intern/cycles/kernel/device/oneapi/compat.h index 30b0f088ede..1b25259bcf5 100644 --- a/intern/cycles/kernel/device/oneapi/compat.h +++ b/intern/cycles/kernel/device/oneapi/compat.h @@ -193,7 +193,7 @@ ccl_always_inline float3 make_float3(float x) #include "util/types.h" /* NOTE(@nsirgien): Declaring these functions after types headers is very important because they - * include oneAPI headers, which transitively include math.h headers which will cause redefintions + * include oneAPI headers, which transitively include math.h headers which will cause redefinitions * of the math defines because math.h also uses them and having them defined before math.h include * is actually UB. */ /* Use fast math functions - get them from sycl::native namespace for native math function |