From dde0e5c0bbc7c327b65f31c131aa08df87e77fe8 Mon Sep 17 00:00:00 2001 From: "Michael A. Kowalski" Date: Sat, 31 Oct 2020 14:56:23 -0400 Subject: USD importer: fixed formatting. --- source/blender/io/usd/import/usd_prim_iterator.cc | 10 ++++++---- source/blender/io/usd/import/usd_prim_iterator.h | 9 +++------ 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/source/blender/io/usd/import/usd_prim_iterator.cc b/source/blender/io/usd/import/usd_prim_iterator.cc index 6567c411549..45ebd58dac6 100644 --- a/source/blender/io/usd/import/usd_prim_iterator.cc +++ b/source/blender/io/usd/import/usd_prim_iterator.cc @@ -25,6 +25,7 @@ #include "usd_reader_object.h" #include "usd_reader_transform.h" +#include #include #include #include @@ -34,11 +35,11 @@ #include #include #include -#include namespace blender::io::usd { -USDObjectReader *USDPrimIterator::get_reader(const pxr::UsdPrim &prim, const USDImporterContext &context) +USDObjectReader *USDPrimIterator::get_reader(const pxr::UsdPrim &prim, + const USDImporterContext &context) { USDObjectReader *result = nullptr; @@ -122,11 +123,12 @@ void USDPrimIterator::debug_traverse_stage(const pxr::UsdStageRefPtr &usd_stage) } pxr::UsdPrimRange prims = usd_stage->Traverse( - pxr::UsdTraverseInstanceProxies(pxr::UsdPrimAllPrimsPredicate)); + pxr::UsdTraverseInstanceProxies(pxr::UsdPrimAllPrimsPredicate)); for (const pxr::UsdPrim &prim : prims) { std::cout << prim.GetPath() << std::endl; - std::cout << " Type: " << prim.GetTypeName() << std::endl;; + std::cout << " Type: " << prim.GetTypeName() << std::endl; + ; } } diff --git a/source/blender/io/usd/import/usd_prim_iterator.h b/source/blender/io/usd/import/usd_prim_iterator.h index 3080cc01141..3cfc992f9b4 100644 --- a/source/blender/io/usd/import/usd_prim_iterator.h +++ b/source/blender/io/usd/import/usd_prim_iterator.h @@ -27,12 +27,9 @@ namespace blender::io::usd { struct USDImporterContext; class USDObjectReader; -class USDPrimIterator -{ - public: - - static USDObjectReader *get_reader(const pxr::UsdPrim &prim, - const USDImporterContext &context); +class USDPrimIterator { + public: + static USDObjectReader *get_reader(const pxr::UsdPrim &prim, const USDImporterContext &context); static void create_readers(const pxr::UsdPrim &root, const USDImporterContext &context, -- cgit v1.2.3