Merge branch 'blender-v4.4-release'

This commit is contained in:
Jesse Yurkovich
2025-02-19 14:09:48 -08:00
2 changed files with 6 additions and 6 deletions

View File

@@ -140,11 +140,11 @@ void AbcPointsReader::read_geometry(bke::GeometrySet &geometry_set,
const P3fArraySamplePtr &positions = sample.getPositions();
const IFloatGeomParam widths_param = m_schema.getWidthsParam();
FloatArraySamplePtr radii;
FloatArraySamplePtr widths;
if (widths_param.valid()) {
IFloatGeomParam::Sample wsample = widths_param.getExpandedValue(sample_sel);
radii = wsample.getVals();
widths = wsample.getVals();
}
if (pointcloud->totpoint != positions->size()) {
@@ -163,9 +163,9 @@ void AbcPointsReader::read_geometry(bke::GeometrySet &geometry_set,
attribute_accessor.lookup_or_add_for_write_span<float>("radius", bke::AttrDomain::Point);
MutableSpan<float> point_radii = point_radii_writer.span;
if (radii) {
for (size_t i = 0; i < radii->size(); i++) {
point_radii[i] = (*radii)[i];
if (widths) {
for (size_t i = 0; i < widths->size(); i++) {
point_radii[i] = (*widths)[i] / 2.0f;
}
}
else {

View File

@@ -150,7 +150,7 @@ void USDNurbsReader::read_curve_sample(Curve *cu, const double motionSampleTime)
float radius = 0.1f;
if (idx < usdWidths.size()) {
radius = usdWidths[idx];
radius = usdWidths[idx] / 2.0f;
}
bp->radius = radius;