Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'blender-v2.83-release'

Browse Source
This commit is contained in:
Bastien Montagne
2020-04-29 10:16:42 +02:00
parent 770605312f b3ac6d1348
commit 1e58255c40
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
build_files/build_environment/install_deps.sh
View File

@@ -2654,7 +2654,7 @@ compile_USD() {
cd $CWD cd $CWD
INFO "Done compiling USD-$USD_VERSION!" INFO "Done compiling USD-$USD_VERSION!"
_is_building=true _is_building=false
else else
INFO "Own USD-$USD_VERSION is up to date, nothing to do!" 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." 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" _1="-D WITH_USD=ON"
PRINT " $_1" PRINT " $_1"
_buildargs="$_buildargs $_1" _buildargs="$_buildargs $_1"
if [ -d $INST/usd ]; then
_1="-D USD_ROOT_DIR=$INST/usd"
PRINT " $_1"
_buildargs="$_buildargs $_1"
fi
fi fi
if [ "$NO_SYSTEM_GLEW" = true ]; then if [ "$NO_SYSTEM_GLEW" = true ]; then