[Bf-blender-cvs] [d05c358bf1e] tmp_libupdate_34: USD build options changes

[Brecht Van Lommel]

Commit: d05c358bf1e2e51558eb2b34dd73a2fda41bdd9e
Author: Brecht Van Lommel
Date:   Tue Aug 16 03:26:23 2022 +0200
Branches: tmp_libupdate_34
https://developer.blender.org/rBd05c358bf1e2e51558eb2b34dd73a2fda41bdd9e

USD build options changes

* Enable OpenVDB
* Remove custom usdBlender namespace

===================================================================

M	build_files/build_environment/cmake/usd.cmake
M	build_files/build_environment/install_deps.sh
M	source/creator/symbols_apple.map

===================================================================

diff --git a/build_files/build_environment/cmake/usd.cmake b/build_files/build_environment/cmake/usd.cmake
index 8a98ac6b884..719005332d6 100644
--- a/build_files/build_environment/cmake/usd.cmake
+++ b/build_files/build_environment/cmake/usd.cmake
@@ -47,13 +47,11 @@ endif()
 set(USD_EXTRA_ARGS
   ${DEFAULT_BOOST_FLAGS}
   ${USD_PLATFORM_FLAGS}
-  # This is a preventative measure that avoids possible conflicts when add-ons
-  # try to load another USD library into the same process space.
-  -DPXR_SET_INTERNAL_NAMESPACE=usdBlender
   -DOPENSUBDIV_ROOT_DIR=${LIBDIR}/opensubdiv
   -DOpenImageIO_ROOT=${LIBDIR}/openimageio
   -DOPENEXR_LIBRARIES=${LIBDIR}/imath/lib/imath${OPENEXR_VERSION_POSTFIX}${LIBEXT}
   -DOPENEXR_INCLUDE_DIR=${LIBDIR}/imath/include
+  -DOPENVDB_LOCATION=${LIBDIR}/openvdb
   -DPXR_ENABLE_PYTHON_SUPPORT=ON
   -DPXR_USE_PYTHON_3=ON
   -DPXR_BUILD_IMAGING=ON
@@ -62,7 +60,7 @@ set(USD_EXTRA_ARGS
   -DPXR_BUILD_TUTORIALS=OFF
   -DPXR_ENABLE_HDF5_SUPPORT=OFF
   -DPXR_ENABLE_MATERIALX_SUPPORT=OFF
-  -DPXR_ENABLE_OPENVDB_SUPPORT=OFF
+  -DPXR_ENABLE_OPENVDB_SUPPORT=ON
   -DPYTHON_EXECUTABLE=${PYTHON_BINARY}
   -DPXR_BUILD_MONOLITHIC=ON
   # OSL is an optional dependency of the Imaging module. However, since that
diff --git a/build_files/build_environment/install_deps.sh b/build_files/build_environment/install_deps.sh
index 4ffdbf2d162..875f7fa7c7e 100755
--- a/build_files/build_environment/install_deps.sh
+++ b/build_files/build_environment/install_deps.sh
@@ -3153,7 +3153,6 @@ compile_USD() {
     if [ -d $INST/tbb ]; then
       cmake_d="$cmake_d $cmake_d -D TBB_ROOT_DIR=$INST/tbb"
     fi
-    cmake_d="$cmake_d -DPXR_SET_INTERNAL_NAMESPACE=usdBlender"
     cmake_d="$cmake_d -DPXR_ENABLE_PYTHON_SUPPORT=OFF"
     cmake_d="$cmake_d -DPXR_BUILD_IMAGING=OFF"
     cmake_d="$cmake_d -DPXR_BUILD_TESTS=OFF"
diff --git a/source/creator/symbols_apple.map b/source/creator/symbols_apple.map
index 5619f151bd2..7514921f839 100644
--- a/source/creator/symbols_apple.map
+++ b/source/creator/symbols_apple.map
@@ -59,7 +59,6 @@ png_*
 *textFileFormatYy*
 *TIFF*
 *tinyformat*
-*usdBlender*
 vorbis*
 vp8*
 vp9*