[Bf-blender-cvs] [bbc52af3acc] usd-importer-T81257-merge: USD Import: braces for if/else statments.
makowalski
noreply at git.blender.org
Fri Apr 16 01:02:18 CEST 2021
Commit: bbc52af3acc775885cb0db2f207e037cff08c722
Author: makowalski
Date: Thu Apr 15 17:24:12 2021 -0400
Branches: usd-importer-T81257-merge
https://developer.blender.org/rBbbc52af3acc775885cb0db2f207e037cff08c722
USD Import: braces for if/else statments.
===================================================================
M source/blender/io/usd/intern/usd_reader_mesh.cc
M source/blender/io/usd/intern/usd_reader_stage.cc
===================================================================
diff --git a/source/blender/io/usd/intern/usd_reader_mesh.cc b/source/blender/io/usd/intern/usd_reader_mesh.cc
index 3b883bd170b..afd94cb89ee 100644
--- a/source/blender/io/usd/intern/usd_reader_mesh.cc
+++ b/source/blender/io/usd/intern/usd_reader_mesh.cc
@@ -434,11 +434,12 @@ void USDMeshReader::read_uvs(Mesh *mesh,
}
MLoopUV *mloopuv = static_cast<MLoopUV *>(layer->data);
- if (is_left_handed_)
+ if (is_left_handed_) {
uv_index = rev_loop_index;
- else
+ }
+ else {
uv_index = loop_index;
-
+ }
mloopuv[uv_index].uv[0] = sample.uvs[usd_uv_index][0];
mloopuv[uv_index].uv[1] = sample.uvs[usd_uv_index][1];
}
@@ -766,8 +767,9 @@ Mesh *USDMeshReader::read_mesh(Mesh *existing_mesh,
}
mesh_prim_.GetOrientationAttr().Get(&orientation_);
- if (orientation_ == pxr::UsdGeomTokens->leftHanded)
+ if (orientation_ == pxr::UsdGeomTokens->leftHanded) {
is_left_handed_ = true;
+ }
std::vector<pxr::TfToken> uv_tokens;
diff --git a/source/blender/io/usd/intern/usd_reader_stage.cc b/source/blender/io/usd/intern/usd_reader_stage.cc
index 6daa4eeb75f..3a2288e0543 100644
--- a/source/blender/io/usd/intern/usd_reader_stage.cc
+++ b/source/blender/io/usd/intern/usd_reader_stage.cc
@@ -207,8 +207,10 @@ static USDPrimReader *_handlePrim(Main *bmain,
// from being added.
if (!(prim.IsPseudoRoot() || prim.IsMaster())) {
reader = USDStageReader::create_reader(prim, params, settings);
- if (reader == NULL)
+
+ if (reader == NULL) {
return NULL;
+ }
reader->parent(parent_reader);
reader->create_object(bmain, 0.0);
More information about the Bf-blender-cvs
mailing list