[Bf-blender-cvs] [c23727639c5] usd-importer-T81257-merge: USD Import: format fixes.
makowalski
noreply at git.blender.org
Mon Apr 5 22:44:35 CEST 2021
Commit: c23727639c51f5bd15aa17d5ecf607a692a95b4c
Author: makowalski
Date: Mon Apr 5 15:45:29 2021 -0400
Branches: usd-importer-T81257-merge
https://developer.blender.org/rBc23727639c51f5bd15aa17d5ecf607a692a95b4c
USD Import: format fixes.
===================================================================
M source/blender/io/usd/intern/usd_reader_mesh.cc
===================================================================
diff --git a/source/blender/io/usd/intern/usd_reader_mesh.cc b/source/blender/io/usd/intern/usd_reader_mesh.cc
index 6c63f72756d..f78e0e0bef2 100644
--- a/source/blender/io/usd/intern/usd_reader_mesh.cc
+++ b/source/blender/io/usd/intern/usd_reader_mesh.cc
@@ -408,8 +408,8 @@ void USDMeshReader::read_uvs(Mesh *mesh,
if (!(sample.interpolation == pxr::UsdGeomTokens->faceVarying ||
sample.interpolation == pxr::UsdGeomTokens->vertex)) {
/* Shouldn't happen. */
- std::cerr << "WARNING: unexpected interpolation type " << sample.interpolation << " for uv "
- << layer->name << std::endl;
+ std::cerr << "WARNING: unexpected interpolation type " << sample.interpolation
+ << " for uv " << layer->name << std::endl;
continue;
}
@@ -775,8 +775,7 @@ Mesh *USDMeshReader::read_mesh(Mesh *existing_mesh,
pxr::TfToken interp = p.GetInterpolation();
- if (!(interp == pxr::UsdGeomTokens->faceVarying ||
- interp == pxr::UsdGeomTokens->vertex)) {
+ if (!(interp == pxr::UsdGeomTokens->faceVarying || interp == pxr::UsdGeomTokens->vertex)) {
continue;
}
More information about the Bf-blender-cvs
mailing list