diff options
author | makowalski <makowalski@nvidia.com> | 2021-03-09 00:25:57 +0300 |
---|---|---|
committer | makowalski <makowalski@nvidia.com> | 2021-03-09 00:25:57 +0300 |
commit | 7be1708487603c8ec96b44de69f0cb37a0b0f9b7 (patch) | |
tree | 6b8d92b96537d8668d512852609cab510a049e41 /source | |
parent | 42bf732dccbd62ba50e04ebf2695b7f6932c58c8 (diff) |
USD Import: Formatting fixes.
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/editors/io/io_usd.c | 10 | ||||
-rw-r--r-- | source/blender/io/usd/intern/usd_capi.cc | 4 |
2 files changed, 7 insertions, 7 deletions
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); |