Merge branch 'master' into blender2.8
[blender.git] / build_files / build_environment / install_deps.sh
index 1c1e9ea151d42ec867984ab163a54ad4cefb1ed6..3816ab1aa0f2f4ab3b1ed70775a693373f27ba3b 100755 (executable)
@@ -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"