diff options
| author | Ray Molenkamp <github@lazydodo.com> | 2022-08-21 10:43:14 +0300 |
|---|---|---|
| committer | Ray Molenkamp <github@lazydodo.com> | 2022-08-21 10:43:14 +0300 |
| commit | af626a6868bdf275ee975804010b1e9eddccbf89 (patch) | |
| tree | 7af4ed5bfc7a9bd0f3773bf34e80c931ef0abb18 /source/blender/io/usd/intern/usd_common.cc | |
| parent | f523ec99d829baae49e87d6559203d49fdf326a4 (diff) | |
deps/windows: fix usd import with standalone python
- move all shared libraries to the blender.shared folder
- install a usercustomize.py to tell python where this folder is
- move USD json folder to a location relative to the shared lib
- Disable USD plugin location hinting for windows
- Fix all tests that broke due to the above.
Diffstat (limited to 'source/blender/io/usd/intern/usd_common.cc')
| -rw-r--r-- | source/blender/io/usd/intern/usd_common.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/source/blender/io/usd/intern/usd_common.cc b/source/blender/io/usd/intern/usd_common.cc index 2b6b6f4ed43..821e2ca0783 100644 --- a/source/blender/io/usd/intern/usd_common.cc +++ b/source/blender/io/usd/intern/usd_common.cc @@ -11,6 +11,11 @@ namespace blender::io::usd { void ensure_usd_plugin_path_registered() { + /* Windows copies the files already to the right location, no hinting + * is required. */ +#ifdef WIN32 + return; +#endif static bool plugin_path_registered = false; if (plugin_path_registered) { return; |