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:
authorBastien Montagne <montagne29@wanadoo.fr>2013-08-10 15:06:46 +0400
committerBastien Montagne <montagne29@wanadoo.fr>2013-08-10 15:06:46 +0400
commit65b4f413427a4b9d178ff3a4cd04f158ccd658cf (patch)
tree26f0d8242ae77404de94c7c51d73eddc0fbcc554 /build_files
parentd17bf458428bcffa04ccb010e84cd31b622b3a2d (diff)
Linux install_deps: update OpenCOLLADA to 828b60384552b83e55d2af7055f07d2c40b4d3f4 repo UID.
Diffstat (limited to 'build_files')
-rwxr-xr-xbuild_files/build_environment/install_deps.sh5
1 files changed, 3 insertions, 2 deletions
diff --git a/build_files/build_environment/install_deps.sh b/build_files/build_environment/install_deps.sh
index 0444f9d288a..ae16b4efaac 100755
--- a/build_files/build_environment/install_deps.sh
+++ b/build_files/build_environment/install_deps.sh
@@ -237,6 +237,7 @@ OSL_SKIP=false
# Version??
OPENCOLLADA_VERSION="1.3"
OPENCOLLADA_SOURCE="https://github.com/KhronosGroup/OpenCOLLADA.git"
+OPENCOLLADA_REPO_UID="828b60384552b83e55d2af7055f07d2c40b4d3f4"
OPENCOLLADA_FORCE_REBUILD=false
OPENCOLLADA_SKIP=false
@@ -1632,7 +1633,7 @@ clean_OpenCOLLADA() {
compile_OpenCOLLADA() {
# To be changed each time we make edits that would modify the compiled results!
- opencollada_magic=6
+ opencollada_magic=7
_init_opencollada
# Clean install if needed!
@@ -1657,7 +1658,7 @@ compile_OpenCOLLADA() {
git pull origin master
# Stick to same rev as windows' libs...
- git checkout e886e196673222f2f4bc32b936dc96419fff815f
+ git checkout $OPENCOLLADA_REPO_UID
git reset --hard
# Always refresh the whole build!