diff options
author | Bastien Montagne <bastien@blender.org> | 2020-04-29 11:16:42 +0300 |
---|---|---|
committer | Bastien Montagne <bastien@blender.org> | 2020-04-29 11:16:42 +0300 |
commit | 1e58255c404cc49edd7391f36a6e7c72f4249700 (patch) | |
tree | 391e9de97a3051a009982c21fb821ede93b014b2 /build_files | |
parent | 770605312fca5a2c8a5838d9a05162c8fe904a05 (diff) | |
parent | b3ac6d13487291a82a8c0bb5b79b471eb75f9223 (diff) |
Merge branch 'blender-v2.83-release'
Diffstat (limited to 'build_files')
-rwxr-xr-x | build_files/build_environment/install_deps.sh | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/build_files/build_environment/install_deps.sh b/build_files/build_environment/install_deps.sh index e8f49c0c75c..6a247e81148 100755 --- a/build_files/build_environment/install_deps.sh +++ b/build_files/build_environment/install_deps.sh @@ -2654,7 +2654,7 @@ compile_USD() { cd $CWD INFO "Done compiling USD-$USD_VERSION!" - _is_building=true + _is_building=false else INFO "Own USD-$USD_VERSION is up to date, nothing to do!" INFO "If you want to force rebuild of this lib, use the --force-usd option." @@ -5354,6 +5354,11 @@ print_info() { _1="-D WITH_USD=ON" PRINT " $_1" _buildargs="$_buildargs $_1" + if [ -d $INST/usd ]; then + _1="-D USD_ROOT_DIR=$INST/usd" + PRINT " $_1" + _buildargs="$_buildargs $_1" + fi fi if [ "$NO_SYSTEM_GLEW" = true ]; then |