[Bf-blender-cvs] [7be17084876] usd-importer-T81257-merge: USD Import: Formatting fixes.

[makowalski]

Commit: 7be1708487603c8ec96b44de69f0cb37a0b0f9b7
Author: makowalski
Date:   Mon Mar 8 16:25:57 2021 -0500
Branches: usd-importer-T81257-merge
https://developer.blender.org/rB7be1708487603c8ec96b44de69f0cb37a0b0f9b7

USD Import: Formatting fixes.

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

M	source/blender/editors/io/io_usd.c
M	source/blender/io/usd/intern/usd_capi.cc

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

diff --git a/source/blender/editors/io/io_usd.c b/source/blender/editors/io/io_usd.c
index c9ec4e2016b..5b8604fe03d 100644
--- a/source/blender/editors/io/io_usd.c
+++ b/source/blender/editors/io/io_usd.c
@@ -623,11 +623,11 @@ void WM_OT_usd_import(struct wmOperatorType *ot)
                   "shader's opacity and opacityThreshold inputs");
 
   RNA_def_boolean(ot->srna,
-    "convert_to_z_up",
-    false,
-    "Convert to Z Up",
-    "When checked and if the USD stage up-axis is Y, apply a rotation "
-    "to the imported objects to convert their orientation to Z up ");
+                  "convert_to_z_up",
+                  false,
+                  "Convert to Z Up",
+                  "When checked and if the USD stage up-axis is Y, apply a rotation "
+                  "to the imported objects to convert their orientation to Z up ");
 }
 
 #endif /* WITH_USD */
diff --git a/source/blender/io/usd/intern/usd_capi.cc b/source/blender/io/usd/intern/usd_capi.cc
index 702104bb2ea..06c25a297fc 100644
--- a/source/blender/io/usd/intern/usd_capi.cc
+++ b/source/blender/io/usd/intern/usd_capi.cc
@@ -252,8 +252,8 @@ static void set_global_rotation(pxr::UsdStageRefPtr stage, ImportSettings &r_set
 
   // Rotate 90 degrees about the X-axis.
   float rmat[3][3];
-  float axis[3] = { 1.0f, 0.0f, 0.0f };
-  axis_angle_normalized_to_mat3(rmat, axis, M_PI/2.0f);
+  float axis[3] = {1.0f, 0.0f, 0.0f};
+  axis_angle_normalized_to_mat3(rmat, axis, M_PI / 2.0f);
 
   unit_m4(r_settings.conversion_mat);
   copy_m4_m3(r_settings.conversion_mat, rmat);