[Bf-blender-cvs] [a80f94e0a1f] usd-importer-T81257-merge: USD importer format fixes.

[makowalski]

Commit: a80f94e0a1ffbafa15a08b8be778d951e37bf69e
Author: makowalski
Date:   Mon Jul 19 00:15:44 2021 -0400
Branches: usd-importer-T81257-merge
https://developer.blender.org/rBa80f94e0a1ffbafa15a08b8be778d951e37bf69e

USD importer format fixes.

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

M	source/blender/io/usd/intern/usd_reader_nurbs.cc
M	source/blender/io/usd/intern/usd_reader_stage.h
M	source/blender/io/usd/intern/usd_reader_xform.cc

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

diff --git a/source/blender/io/usd/intern/usd_reader_nurbs.cc b/source/blender/io/usd/intern/usd_reader_nurbs.cc
index e56e44b0602..9055bb97614 100644
--- a/source/blender/io/usd/intern/usd_reader_nurbs.cc
+++ b/source/blender/io/usd/intern/usd_reader_nurbs.cc
@@ -136,7 +136,7 @@ void USDNurbsReader::read_curve_sample(Curve *cu, const double motionSampleTime)
       nu->orderv = 4;
     }
 
-  /* TODO(makowalski): investigate setting Cyclic U and Endpoint U options. */
+    /* TODO(makowalski): investigate setting Cyclic U and Endpoint U options. */
 #if 0
      if (knots.size() > 3) {
        if ((knots[0] == knots[1]) && (knots[knots.size()] == knots[knots.size() - 1])) {
diff --git a/source/blender/io/usd/intern/usd_reader_stage.h b/source/blender/io/usd/intern/usd_reader_stage.h
index 476bb32a6f5..9fa9f2a1128 100644
--- a/source/blender/io/usd/intern/usd_reader_stage.h
+++ b/source/blender/io/usd/intern/usd_reader_stage.h
@@ -23,8 +23,8 @@ struct Main;
 #include "usd.h"
 #include "usd_reader_prim.h"
 
-#include <pxr/usd/usdGeom/imageable.h>
 #include <pxr/usd/usd/stage.h>
+#include <pxr/usd/usdGeom/imageable.h>
 
 #include <vector>
 
diff --git a/source/blender/io/usd/intern/usd_reader_xform.cc b/source/blender/io/usd/intern/usd_reader_xform.cc
index 627ba75de4b..12b66518e1e 100644
--- a/source/blender/io/usd/intern/usd_reader_xform.cc
+++ b/source/blender/io/usd/intern/usd_reader_xform.cc
@@ -28,8 +28,8 @@
 
 #include "DNA_cachefile_types.h"
 #include "DNA_constraint_types.h"
-#include "DNA_object_types.h"
 #include "DNA_modifier_types.h"
+#include "DNA_object_types.h"
 #include "DNA_space_types.h" /* for FILE_MAX */
 
 #include <pxr/base/gf/math.h>