diff options
| author | Brecht Van Lommel <brecht> | 2020-09-18 19:04:30 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brecht@blender.org> | 2020-09-18 19:11:32 +0300 |
| commit | 7b988188dc3f5ea05d90b8e16337147778f9f580 (patch) | |
| tree | 89a138c53f6f0957f9a59946679d6b96afbfe235 /build_files/build_environment/patches | |
| parent | 007e90e8c0a9176e16e70861d87dc7f883cc78ba (diff) | |
Fix T79929: crashes with Cycles denoising on older Macs
This was a bug in OpenImageDenoise, upgrade to latest 1.2.3 which has the fix.
This in turn required a newer ispc version.
Differential Revision: https://developer.blender.org/D8892
Diffstat (limited to 'build_files/build_environment/patches')
| -rw-r--r-- | build_files/build_environment/patches/ispc.diff | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/build_files/build_environment/patches/ispc.diff b/build_files/build_environment/patches/ispc.diff index 689dd0abdc5..3ab67356e19 100644 --- a/build_files/build_environment/patches/ispc.diff +++ b/build_files/build_environment/patches/ispc.diff @@ -19,16 +19,16 @@ diff -Naur orig/CMakeLists.txt external_ispc/CMakeLists.txt target_include_directories(${PROJECT_NAME} PRIVATE - ${LLVM_INCLUDE_DIRS} + ${LLVM_INCLUDE_DIRS} ${CLANG_INCLUDE_DIRS} + ${GENX_DEPS_DIR}/include ${CMAKE_CURRENT_SOURCE_DIR}/src ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}) - # Compile options diff -Naur orig/cmake/GenerateBuiltins.cmake.txt external_ispc/cmake/GenerateBuiltins.cmake.txt +++ orig/cmake/GenerateBuiltins.cmake 2020-05-25 13:32:40.830803821 +0200 +++ external_ispc/cmake/GenerateBuiltins.cmake 2020-05-25 13:32:40.830803821 +0200 @@ -97,6 +97,8 @@ if ("${bit}" STREQUAL "32" AND ${arch} STREQUAL "x86") - set(target_arch "i386") + set(target_arch "i686") + # Blender: disable 32bit due to build issues on Linux and being unnecessary. + set(SKIP ON) elseif ("${bit}" STREQUAL "64" AND ${arch} STREQUAL "x86") |