[Bf-blender-cvs] [498b7bd7] master: Updated install_deps.sh to OSD 3.0.5 (and switch from git repo to download archive of sources).
Bastien Montagne
noreply at git.blender.org
Wed Aug 10 19:20:12 CEST 2016
Commit: 498b7bd7ce3411dff79b5acfd550c2126fe0b7ac
Author: Bastien Montagne
Date: Wed Aug 10 19:18:53 2016 +0200
Branches: master
https://developer.blender.org/rB498b7bd7ce3411dff79b5acfd550c2126fe0b7ac
Updated install_deps.sh to OSD 3.0.5 (and switch from git repo to download archive of sources).
===================================================================
M build_files/build_environment/install_deps.sh
===================================================================
diff --git a/build_files/build_environment/install_deps.sh b/build_files/build_environment/install_deps.sh
index 7230fc4..51928b8 100755
--- a/build_files/build_environment/install_deps.sh
+++ b/build_files/build_environment/install_deps.sh
@@ -337,7 +337,7 @@ OSL_FORCE_REBUILD=false
OSL_SKIP=false
# OpenSubdiv needs to be compiled for now
-OSD_VERSION="3.0.2"
+OSD_VERSION="3.0.5"
OSD_VERSION_MIN=$OSD_VERSION
OSD_FORCE_BUILD=false
OSD_FORCE_REBUILD=false
@@ -739,7 +739,7 @@ OSL_SOURCE_REPO=( "https://github.com/Nazg-Gul/OpenShadingLanguage.git" )
OSL_SOURCE_REPO_UID="7d40ff5fe8e47b030042afb92d0e955f5aa96f48"
OSL_SOURCE_REPO_BRANCH="blender-fixes"
-OSD_USE_REPO=true
+OSD_USE_REPO=false
# Script foo to make the version string compliant with the archive name:
# ${Varname//SearchForThisChar/ReplaceWithThisChar}
OSD_SOURCE=( "https://github.com/PixarAnimationStudios/OpenSubdiv/archive/v${OSD_VERSION//./_}.tar.gz" )
@@ -1907,7 +1907,7 @@ compile_OSD() {
fi
# To be changed each time we make edits that would modify the compiled result!
- osd_magic=1
+ osd_magic=2
_init_osd
# Clean install if needed!
More information about the Bf-blender-cvs
mailing list