diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2017-04-05 11:02:25 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2017-04-05 11:02:25 +0300 |
| commit | e9bb018a4aea1b4aeb692cdadce158496a270e32 (patch) | |
| tree | 9f8c122feb8a68cc34f5ab6c99407a20d72fa50d /build_files | |
| parent | 4dadb6d4453d84d537e25e753f7904ce5c8539fb (diff) | |
| parent | 8647d5af9015097698984e9864802848914e803c (diff) | |
Merge branch 'master' into blender2.8
Conflicts:
source/blender/alembic/intern/abc_exporter.h
Diffstat (limited to 'build_files')
| -rwxr-xr-x | build_files/build_environment/install_deps.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/build_files/build_environment/install_deps.sh b/build_files/build_environment/install_deps.sh index 5fc059c5c15..479585656d1 100755 --- a/build_files/build_environment/install_deps.sh +++ b/build_files/build_environment/install_deps.sh @@ -317,8 +317,8 @@ OPENEXR_FORCE_REBUILD=false OPENEXR_SKIP=false _with_built_openexr=false -OIIO_VERSION="1.7.8" -OIIO_VERSION_MIN="1.6.0" +OIIO_VERSION="1.7.13" +OIIO_VERSION_MIN="1.7.13" OIIO_VERSION_MAX="1.9.0" # UNKNOWN currently # Not supported by current OSL... OIIO_FORCE_BUILD=false OIIO_FORCE_REBUILD=false |