diff options
| author | Bastien Montagne <bastien@blender.org> | 2022-07-29 16:17:40 +0300 |
|---|---|---|
| committer | Bastien Montagne <bastien@blender.org> | 2022-07-29 16:17:40 +0300 |
| commit | d3879e9aaa43be6dc52fccdb0ae35994271c1a95 (patch) | |
| tree | 5b6a388906f0fd2a87549cc383d48a7c4f60c016 /build_files | |
| parent | a679164cf6e87a05bbd8c9e12899d882ea817003 (diff) | |
| parent | 065dfe744cb94cb63db19353b1c00a5dc1356dfb (diff) | |
Merge branch 'blender-v3.3-release'
Diffstat (limited to 'build_files')
| -rwxr-xr-x | build_files/build_environment/install_deps.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/build_files/build_environment/install_deps.sh b/build_files/build_environment/install_deps.sh index 2441b9ad89b..f31a3fe02f5 100755 --- a/build_files/build_environment/install_deps.sh +++ b/build_files/build_environment/install_deps.sh @@ -478,7 +478,7 @@ OCIO_FORCE_BUILD=false OCIO_FORCE_REBUILD=false OCIO_SKIP=false -IMATH_VERSION="3.1.4" +IMATH_VERSION="3.1.5" IMATH_VERSION_SHORT="3.1" IMATH_VERSION_MIN="3.0" IMATH_VERSION_MEX="4.0" @@ -487,7 +487,7 @@ IMATH_FORCE_REBUILD=false IMATH_SKIP=false _with_built_imath=false -OPENEXR_VERSION="3.1.4" +OPENEXR_VERSION="3.1.5" OPENEXR_VERSION_SHORT="3.1" OPENEXR_VERSION_MIN="3.0" OPENEXR_VERSION_MEX="4.0" @@ -3000,7 +3000,7 @@ compile_ALEMBIC() { fi # To be changed each time we make edits that would modify the compiled result! - alembic_magic=2 + alembic_magic=3 _init_alembic # Force having own builds for the dependencies. @@ -3048,7 +3048,7 @@ compile_ALEMBIC() { fi if [ "$_with_built_openexr" = true ]; then cmake_d="$cmake_d -D USE_ARNOLD=OFF" - cmake_d="$cmake_d -D USE_BINARIES=OFF" + cmake_d="$cmake_d -D USE_BINARIES=ON" # Tests use some Alembic binaries... cmake_d="$cmake_d -D USE_EXAMPLES=OFF" cmake_d="$cmake_d -D USE_HDF5=OFF" cmake_d="$cmake_d -D USE_MAYA=OFF" |