diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2017-08-10 12:14:36 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2017-08-10 12:14:36 +0300 |
| commit | 8c4ccab5fecad4be8603d9b2bfe325b485ca7075 (patch) | |
| tree | 6db69948178cb2667d348ebabb9598c9e8f6c162 /build_files | |
| parent | 464c045b31b54d284da59efa71530fb6092696d3 (diff) | |
| parent | cf7a2c93e3a897a3300bc7df527c8ba271da0424 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'build_files')
| -rwxr-xr-x | build_files/build_environment/install_deps.sh | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/build_files/build_environment/install_deps.sh b/build_files/build_environment/install_deps.sh index 1c1e9ea151d..3816ab1aa0f 100755 --- a/build_files/build_environment/install_deps.sh +++ b/build_files/build_environment/install_deps.sh @@ -1591,7 +1591,7 @@ compile_OIIO() { fi # To be changed each time we make edits that would modify the compiled result! - oiio_magic=16 + oiio_magic=17 _init_oiio # Clean install if needed! @@ -1655,6 +1655,9 @@ compile_OIIO() { INFO "ILMBASE_HOME=$INST/openexr" fi + # ptex is only needed when nicholas bishop is ready + cmake_d="$cmake_d -D USE_PTEX=OFF" + # Optional tests and cmd tools cmake_d="$cmake_d -D USE_QT=OFF" cmake_d="$cmake_d -D USE_PYTHON=OFF" |