diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2017-06-09 12:40:47 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2017-06-09 12:40:47 +0300 |
| commit | bb773acd5f22e97896b62aaf9ba9c4f0e8304320 (patch) | |
| tree | 9211838df95b8159801a9dcc4dacf593edc8510f /build_files | |
| parent | 16ecd0b79e34da4186a9ddfae185eb67609acb81 (diff) | |
| parent | d7f33668d6e69f22e0b0ee28be0039df00f63ad3 (diff) | |
Merge branch 'master' into blender2.8
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 95cb82ee6ec..cab67e68e0e 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.13" -OIIO_VERSION_MIN="1.7.13" +OIIO_VERSION="1.7.15" +OIIO_VERSION_MIN="1.7.15" OIIO_VERSION_MAX="1.9.0" # UNKNOWN currently # Not supported by current OSL... OIIO_FORCE_BUILD=false OIIO_FORCE_REBUILD=false @@ -361,7 +361,7 @@ ALEMBIC_FORCE_BUILD=false ALEMBIC_FORCE_REBUILD=false ALEMBIC_SKIP=false -OPENCOLLADA_VERSION="1.6.47" +OPENCOLLADA_VERSION="1.6.51" OPENCOLLADA_FORCE_BUILD=false OPENCOLLADA_FORCE_REBUILD=false OPENCOLLADA_SKIP=false @@ -780,7 +780,7 @@ ALEMBIC_SOURCE=( "https://github.com/alembic/alembic/archive/${ALEMBIC_VERSION}. # ALEMBIC_SOURCE_REPO_BRANCH="master" OPENCOLLADA_SOURCE=( "https://github.com/KhronosGroup/OpenCOLLADA.git" ) -OPENCOLLADA_REPO_UID="22b1f4ff026881b4d2804d397730286ab7e3d090" +OPENCOLLADA_REPO_UID="0c2cdc17c22cf42050e4d42154bed2176363549c" OPENCOLLADA_REPO_BRANCH="master" FFMPEG_SOURCE=( "http://ffmpeg.org/releases/ffmpeg-$FFMPEG_VERSION.tar.bz2" ) |