diff options
author | Hans Goudey <h.goudey@me.com> | 2021-08-27 07:41:41 +0300 |
---|---|---|
committer | Hans Goudey <h.goudey@me.com> | 2021-08-27 07:41:41 +0300 |
commit | a0f754e7749a485c97718433edbbab5ac76cdc7a (patch) | |
tree | d968d66e73be6dbac5997a3f5bb8e33e462c96d3 /source/blender/io/usd | |
parent | 137a5e162c2435662dbb299ff49771e7d2e7598f (diff) | |
parent | 523bc981cfeecead5050e7af44bbe252c166d718 (diff) |
Merge branch 'master' into refactor-idprop-ui-datarefactor-idprop-ui-data
Diffstat (limited to 'source/blender/io/usd')
-rw-r--r-- | source/blender/io/usd/CMakeLists.txt | 4 | ||||
-rw-r--r-- | source/blender/io/usd/usd.h | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/io/usd/CMakeLists.txt b/source/blender/io/usd/CMakeLists.txt index 5499fe36898..12015bf1698 100644 --- a/source/blender/io/usd/CMakeLists.txt +++ b/source/blender/io/usd/CMakeLists.txt @@ -77,8 +77,8 @@ set(SRC intern/usd_reader_nurbs.cc intern/usd_reader_prim.cc intern/usd_reader_stage.cc - intern/usd_reader_xform.cc intern/usd_reader_volume.cc + intern/usd_reader_xform.cc usd.h @@ -102,8 +102,8 @@ set(SRC intern/usd_reader_nurbs.h intern/usd_reader_prim.h intern/usd_reader_stage.h - intern/usd_reader_xform.h intern/usd_reader_volume.h + intern/usd_reader_xform.h ) set(LIB diff --git a/source/blender/io/usd/usd.h b/source/blender/io/usd/usd.h index 6b6b2d37162..2a036c3d398 100644 --- a/source/blender/io/usd/usd.h +++ b/source/blender/io/usd/usd.h @@ -25,11 +25,11 @@ extern "C" { #endif -struct bContext; -struct Object; struct CacheArchiveHandle; -struct CacheReader; struct CacheFile; +struct CacheReader; +struct Object; +struct bContext; struct USDExportParams { bool export_animation; |