Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael A. Kowalski <makowalski@nvidia.com>2020-10-31 21:56:23 +0300
committerMichael A. Kowalski <makowalski@nvidia.com>2020-10-31 21:56:23 +0300
commitdde0e5c0bbc7c327b65f31c131aa08df87e77fe8 (patch)
treeeedf52d4efbc2ad356dc32a6a1b47216fbfbe648
parent605c0d1f1bc37ed958038d7839b11d747f6cc8ac (diff)
USD importer: fixed formatting.
-rw-r--r--source/blender/io/usd/import/usd_prim_iterator.cc10
-rw-r--r--source/blender/io/usd/import/usd_prim_iterator.h9
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 <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,