diff options
| author | YimingWu <xp8110@outlook.com> | 2020-02-01 05:35:40 +0300 |
|---|---|---|
| committer | YimingWu <xp8110@outlook.com> | 2020-02-01 05:35:40 +0300 |
| commit | f7770cb97bb9d19d0806f67da9377129fd4d09b0 (patch) | |
| tree | 2cd22d612ffba3a509d5548332c9cc8a06a1a638 /source/blender/usd/intern/usd_capi.cc | |
| parent | b47883a990ee68e659a8a8b44729be9b8e0d002f (diff) | |
| parent | dc3f073d1c5255e79763dfff3ef17f6216f1b391 (diff) | |
Merge remote-tracking branch 'origin/master' into temp-lanpr-review
Diffstat (limited to 'source/blender/usd/intern/usd_capi.cc')
| -rw-r--r-- | source/blender/usd/intern/usd_capi.cc | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/source/blender/usd/intern/usd_capi.cc b/source/blender/usd/intern/usd_capi.cc index 502f8677174..83e11cd7bf3 100644 --- a/source/blender/usd/intern/usd_capi.cc +++ b/source/blender/usd/intern/usd_capi.cc @@ -20,9 +20,12 @@ #include "usd.h" #include "usd_hierarchy_iterator.h" +#include <pxr/pxr.h> #include <pxr/usd/usd/stage.h> #include <pxr/usd/usdGeom/tokens.h> +#include "MEM_guardedalloc.h" + extern "C" { #include "DEG_depsgraph.h" #include "DEG_depsgraph_build.h" @@ -39,8 +42,6 @@ extern "C" { #include "BLI_path_util.h" #include "BLI_string.h" -#include "MEM_guardedalloc.h" - #include "WM_api.h" #include "WM_types.h" } @@ -216,3 +217,17 @@ bool USD_export(bContext *C, return export_ok; } + +int USD_get_version(void) +{ + /* USD 19.11 defines: + * + * #define PXR_MAJOR_VERSION 0 + * #define PXR_MINOR_VERSION 19 + * #define PXR_PATCH_VERSION 11 + * #define PXR_VERSION 1911 + * + * So the major version is implicit/invisible in the public version number. + */ + return PXR_VERSION; +} |