diff options
| author | Antonio Vazquez <blendergit@gmail.com> | 2019-10-02 14:15:37 +0300 |
|---|---|---|
| committer | Antonio Vazquez <blendergit@gmail.com> | 2019-10-02 14:15:37 +0300 |
| commit | 386ba094988fc793f8e060d15438566e5e2d2cae (patch) | |
| tree | 4cbde50b5d1d7a45c89ee99c29dd1b86d1d97b59 /intern/cycles/util/util_defines.h | |
| parent | 6129e20cec4639aebf335ff13b2ba0c59670662d (diff) | |
| parent | f97a64aa9b7b384f8221a1ef4f2eef9cde1238db (diff) | |
Merge branch 'master' into temp-gpencil-drw-engine
Conflicts:
source/blender/draw/engines/gpencil/gpencil_engine.c
Diffstat (limited to 'intern/cycles/util/util_defines.h')
| -rw-r--r-- | intern/cycles/util/util_defines.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/intern/cycles/util/util_defines.h b/intern/cycles/util/util_defines.h index 760985447a8..2778cffba3a 100644 --- a/intern/cycles/util/util_defines.h +++ b/intern/cycles/util/util_defines.h @@ -39,6 +39,7 @@ # define ccl_private # define ccl_restrict __restrict # define ccl_ref & +# define ccl_optional_struct_init # define __KERNEL_WITH_SSE_ALIGN__ # if defined(_WIN32) && !defined(FREE_WINDOWS) |