Blender Git Loki
Git Commits -> Revision eed13c0
Revision eed13c0 by Sybren A. Stüvel (temp-sybren-usd-patch-01) November 28, 2019, 13:29 (GMT) |
USD: Revamped building & bundling process - USD is now built as monolithic library, instead of 25 smaller libraries. We were linking all of them as 'whole archive' anyway, so this doesn't affect the final file size. It does, however, make life easier with respect to linking order, and handling upstream changes. - The JSON files required by USD are installed into bin/usd; they are required on every platform. - USD is patched so that it finds the aforementioned JSON files in a path relative to the running executable. When left unpatched, the only way to influence the search path for those files is to set an environment variable BEFORE Blender starts (USD uses static initialisers, so by the time the USD exporter runs, it has already unsuccessfully tried loading the JSON files, and won't re-investigate that environment variable ever again). - USD is patched to have a `PXR_BUILD_USD_TOOLS` CMake option to disable building the tools in its `bin` directory. This is sent as a pull request at https://github.com/PixarAnimationStudios/USD/pull/1048 |
Commit Details:
Full Hash: eed13c06f2d32bb7c2a9eae8bac1bb29c5cf7129
Parent Commit: 41d33eb
Lines Changed: +118, -63
9 Modified Paths:
/build_files/build_environment/cmake/harvest.cmake (+6, -4) (Diff)
/build_files/build_environment/cmake/usd.cmake (+2, -17) (Diff)
/build_files/build_environment/patches/usd.diff (+57, -7) (Diff)
/build_files/cmake/macros.cmake (+17, -4) (Diff)
/build_files/cmake/Modules/FindUSD.cmake (+11, -21) (Diff)
/build_files/cmake/platform/platform_apple.cmake (+5, -0) (Diff)
/build_files/cmake/platform/platform_win32.cmake (+15, -1) (Diff)
/source/blender/usd/CMakeLists.txt (+0, -3) (Diff)
/source/creator/CMakeLists.txt (+5, -6) (Diff)
/build_files/build_environment/cmake/usd.cmake (+2, -17) (Diff)
/build_files/build_environment/patches/usd.diff (+57, -7) (Diff)
/build_files/cmake/macros.cmake (+17, -4) (Diff)
/build_files/cmake/Modules/FindUSD.cmake (+11, -21) (Diff)
/build_files/cmake/platform/platform_apple.cmake (+5, -0) (Diff)
/build_files/cmake/platform/platform_win32.cmake (+15, -1) (Diff)
/source/blender/usd/CMakeLists.txt (+0, -3) (Diff)
/source/creator/CMakeLists.txt (+5, -6) (Diff)