[Bf-blender-cvs] [d8374abc901] usd-importer-T81257: Format changes.

[Michael A. Kowalski]

Commit: d8374abc90102e878babeeb1da16cbf2186bb760
Author: Michael A. Kowalski
Date:   Thu Oct 8 19:30:49 2020 -0400
Branches: usd-importer-T81257
https://developer.blender.org/rBd8374abc90102e878babeeb1da16cbf2186bb760

Format changes.

===================================================================

M	source/blender/io/usd/intern/usd_reader_object.h
M	source/blender/io/usd/intern/usd_reader_transform.cc
M	source/blender/io/usd/intern/usd_reader_transform.h
M	source/blender/io/usd/intern/usd_util.cc

===================================================================

diff --git a/source/blender/io/usd/intern/usd_reader_object.h b/source/blender/io/usd/intern/usd_reader_object.h
index 649c60f8835..cfac26ca7d3 100644
--- a/source/blender/io/usd/intern/usd_reader_object.h
+++ b/source/blender/io/usd/intern/usd_reader_object.h
@@ -33,7 +33,7 @@ struct Object;
 namespace blender::io::usd {
 
 class UsdObjectReader {
-public:
+ public:
   typedef std::vector<UsdObjectReader *> ptr_vector;
 
  protected:
@@ -64,7 +64,6 @@ public:
   bool merged_with_parent_;
 
  public:
-
   explicit UsdObjectReader(const pxr::UsdPrim &prim, const USDImporterContext &context);
 
   virtual ~UsdObjectReader();
@@ -85,11 +84,13 @@ public:
     parent_ = par;
   }
 
-  void set_merged_with_parent(bool flag) {
+  void set_merged_with_parent(bool flag)
+  {
     merged_with_parent_ = flag;
   }
 
-  bool merged_with_parent() const {
+  bool merged_with_parent() const
+  {
     return merged_with_parent_;
   }
 
diff --git a/source/blender/io/usd/intern/usd_reader_transform.cc b/source/blender/io/usd/intern/usd_reader_transform.cc
index d12c9d6ff8c..1313ae16c5d 100644
--- a/source/blender/io/usd/intern/usd_reader_transform.cc
+++ b/source/blender/io/usd/intern/usd_reader_transform.cc
@@ -22,13 +22,11 @@
 #include "BKE_object.h"
 #include "DNA_object_types.h"
 
-
 namespace blender::io::usd {
 
 UsdTransformReader::UsdTransformReader(const pxr::UsdPrim &prim, const USDImporterContext &context)
-  : UsdObjectReader(prim, context), xform_(prim)
+    : UsdObjectReader(prim, context), xform_(prim)
 {
-
 }
 
 bool UsdTransformReader::valid() const
diff --git a/source/blender/io/usd/intern/usd_reader_transform.h b/source/blender/io/usd/intern/usd_reader_transform.h
index a6c79fbf156..6fb8b810730 100644
--- a/source/blender/io/usd/intern/usd_reader_transform.h
+++ b/source/blender/io/usd/intern/usd_reader_transform.h
@@ -26,9 +26,9 @@ namespace blender::io::usd {
 
 class UsdTransformReader : public UsdObjectReader {
 
-pxr::UsdGeomXform xform_;
+  pxr::UsdGeomXform xform_;
 
-public:
+ public:
   UsdTransformReader(const pxr::UsdPrim &prim, const USDImporterContext &context);
 
   bool valid() const override;
diff --git a/source/blender/io/usd/intern/usd_util.cc b/source/blender/io/usd/intern/usd_util.cc
index f50b23bf08a..8a861d4c39b 100644
--- a/source/blender/io/usd/intern/usd_util.cc
+++ b/source/blender/io/usd/intern/usd_util.cc
@@ -250,11 +250,12 @@ void create_readers(const pxr::UsdStageRefPtr &usd_stage,
 
     std::string prim_path = prim.GetPath().GetString();
 
-    std::map<std::string, UsdObjectReader *>::const_iterator prim_entry = readers_map.find(prim_path);
+    std::map<std::string, UsdObjectReader *>::const_iterator prim_entry = readers_map.find(
+        prim_path);
 
-    if (prim_entry != readers_map.end())
-    {
-      /* We already processed the reader for this prim, probably when merging it with its parent. */
+    if (prim_entry != readers_map.end()) {
+      /* We already processed the reader for this prim, probably when merging it with its parent.
+       */
       continue;
     }
 
@@ -265,17 +266,16 @@ void create_readers(const pxr::UsdStageRefPtr &usd_stage,
 
       /* Check if the Xform and prim should be merged. */
 
-      pxr::UsdPrimSiblingRange children = prim.GetFilteredChildren(pxr::UsdTraverseInstanceProxies(pxr::UsdPrimAllPrimsPredicate));
+      pxr::UsdPrimSiblingRange children = prim.GetFilteredChildren(
+          pxr::UsdTraverseInstanceProxies(pxr::UsdPrimAllPrimsPredicate));
 
       size_t num_children = boost::size(children);
 
       /* Merge only if the Xform has a single Mesh child. */
-      if (num_children == 1)
-      {
+      if (num_children == 1) {
         pxr::UsdPrim child_prim = children.front();
- 
-        if (child_prim && child_prim.GetTypeName() == usdtokens::mesh_type)
-        {
+
+        if (child_prim && child_prim.GetTypeName() == usdtokens::mesh_type) {
           /* We don't create a reader for the current Xform prim, but instead
            * make a single reader that will merge the Xform and its child. */
 
@@ -285,7 +285,8 @@ void create_readers(const pxr::UsdStageRefPtr &usd_stage,
 
           if (reader) {
             reader->set_merged_with_parent(true);
-          } else {
+          }
+          else {
             std::cerr << "WARNING:  Couldn't get reader when merging child prim." << std::endl;
           }
         }
@@ -304,7 +305,8 @@ void create_readers(const pxr::UsdStageRefPtr &usd_stage,
   }
 
   /* Set parenting. */
-  for (std::vector<UsdObjectReader*>::iterator it = r_readers.begin(); it != r_readers.end(); ++it) {
+  for (std::vector<UsdObjectReader *>::iterator it = r_readers.begin(); it != r_readers.end();
+       ++it) {
 
     pxr::UsdPrim parent = (*it)->prim().GetParent();
 
@@ -316,14 +318,14 @@ void create_readers(const pxr::UsdStageRefPtr &usd_stage,
     if (parent) {
       std::string parent_path = parent.GetPath().GetString();
 
-      std::map<std::string, UsdObjectReader *>::const_iterator parent_entry = readers_map.find(parent_path);
+      std::map<std::string, UsdObjectReader *>::const_iterator parent_entry = readers_map.find(
+          parent_path);
 
       if (parent_entry != readers_map.end()) {
         (*it)->set_parent(parent_entry->second);
       }
     }
   }
-
 }
 
 } /* namespace blender::io::usd */