Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRay Molenkamp <github@lazydodo.com>2018-12-05 18:46:12 +0300
committerRay Molenkamp <github@lazydodo.com>2018-12-05 18:46:12 +0300
commit81449320e4a5aa421102c0fb26765969719143d6 (patch)
tree6fb0dbb48971e8263409330683f26da62d01ca41 /build_files
parent16aa7dfa196df376f5c23f8892b172128b38bb52 (diff)
parent4cb6d976916c353581de4dbfdcddb84e71173bbe (diff)
Merge remote-tracking branch 'origin/master' into blender2.8
Diffstat (limited to 'build_files')
-rw-r--r--build_files/build_environment/cmake/versions.cmake4
1 files changed, 2 insertions, 2 deletions
diff --git a/build_files/build_environment/cmake/versions.cmake b/build_files/build_environment/cmake/versions.cmake
index 85f59762ef2..3b4b5da26f4 100644
--- a/build_files/build_environment/cmake/versions.cmake
+++ b/build_files/build_environment/cmake/versions.cmake
@@ -113,9 +113,9 @@ set(SDL_VERSION 2.0.8)
set(SDL_URI https://www.libsdl.org/release/SDL2-${SDL_VERSION}.tar.gz)
set(SDL_HASH 3800d705cef742c6a634f202c37f263f)
-set(OPENCOLLADA_VERSION v1.6.63)
+set(OPENCOLLADA_VERSION v1.6.68)
set(OPENCOLLADA_URI https://github.com/KhronosGroup/OpenCOLLADA/archive/${OPENCOLLADA_VERSION}.tar.gz)
-set(OPENCOLLADA_HASH e937c3897b86fc0da53cde97257f5156)
+set(OPENCOLLADA_HASH ee7dae874019fea7be11613d07567493)
set(OPENCOLORIO_VERSION 1.1.0)
set(OPENCOLORIO_URI https://github.com/imageworks/OpenColorIO/archive/v${OPENCOLORIO_VERSION}.tar.gz)