[Bf-blender-cvs] [dde0e5c0bbc] usd-importer-T81257: USD importer: fixed formatting.
Michael A. Kowalski
noreply at git.blender.org
Sat Oct 31 21:47:30 CET 2020
Commit: dde0e5c0bbc7c327b65f31c131aa08df87e77fe8
Author: Michael A. Kowalski
Date: Sat Oct 31 14:56:23 2020 -0400
Branches: usd-importer-T81257
https://developer.blender.org/rBdde0e5c0bbc7c327b65f31c131aa08df87e77fe8
USD importer: fixed formatting.
===================================================================
M source/blender/io/usd/import/usd_prim_iterator.cc
M source/blender/io/usd/import/usd_prim_iterator.h
===================================================================
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 <iostream>
#include <pxr/base/plug/registry.h>
#include <pxr/pxr.h>
#include <pxr/usd/usd/prim.h>
@@ -34,11 +35,11 @@
#include <pxr/usd/usdGeom/scope.h>
#include <pxr/usd/usdGeom/tokens.h>
#include <pxr/usd/usdGeom/xformable.h>
-#include <iostream>
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,
More information about the Bf-blender-cvs
mailing list