[Bf-blender-cvs] [0562c8b250c] temp-usd-latest-master: USD export: redundant call to set stage units
Michael Kowalski
noreply at git.blender.org
Fri Sep 10 04:34:32 CEST 2021
Commit: 0562c8b250c8f0de2aedafd905932180647ae4e8
Author: Michael Kowalski
Date: Thu Sep 9 16:02:08 2021 -0400
Branches: temp-usd-latest-master
https://developer.blender.org/rB0562c8b250c8f0de2aedafd905932180647ae4e8
USD export: redundant call to set stage units
Setting the stage meters per unit metadata was being called
in two places unnecessarily. Removed redundant call.
===================================================================
M source/blender/io/usd/intern/usd_capi_export.cc
===================================================================
diff --git a/source/blender/io/usd/intern/usd_capi_export.cc b/source/blender/io/usd/intern/usd_capi_export.cc
index 4eb79b1583d..e8014fed7b2 100644
--- a/source/blender/io/usd/intern/usd_capi_export.cc
+++ b/source/blender/io/usd/intern/usd_capi_export.cc
@@ -196,8 +196,6 @@ static void export_startjob(void *customdata,
}
usd_stage->SetMetadata(pxr::UsdGeomTokens->upAxis, upAxis);
- usd_stage->SetMetadata(pxr::UsdGeomTokens->metersPerUnit,
- pxr::VtValue(scene->unit.scale_length));
usd_stage->GetRootLayer()->SetDocumentation(std::string("Blender ") +
BKE_blender_version_string());
@@ -265,7 +263,8 @@ static void export_startjob(void *customdata,
}
}
- // Set Scale
+ /* Set unit scale.
+ * TODO(makowalsk): Add an option to use scene->unit.scale_length as well? */
double meters_per_unit = data->params.convert_to_cm ? pxr::UsdGeomLinearUnits::centimeters :
pxr::UsdGeomLinearUnits::meters;
pxr::UsdGeomSetStageMetersPerUnit(usd_stage, meters_per_unit);
More information about the Bf-blender-cvs
mailing list