diff options
author | Aaron Carlisle <carlisle.b3d@gmail.com> | 2021-12-02 07:34:51 +0300 |
---|---|---|
committer | Aaron Carlisle <carlisle.b3d@gmail.com> | 2021-12-02 07:34:51 +0300 |
commit | 0de1d2e84efe5fb085847328e891fbf0f3f17b4f (patch) | |
tree | 45d2813824f7d47516f4650f882959f172e41426 /source | |
parent | bb3d03973ad59bfbc1048726d4d77bd353e4fe32 (diff) |
Cleanup: FIx build with USD after recent refactor
rB218360a89217f4e8321319035bf4d9ff97fb2658 missed a couple renames in USD code paths.
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/io/usd/intern/usd_reader_curve.cc | 6 | ||||
-rw-r--r-- | source/blender/io/usd/intern/usd_reader_nurbs.cc | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/io/usd/intern/usd_reader_curve.cc b/source/blender/io/usd/intern/usd_reader_curve.cc index 12de1d82c72..5007d204020 100644 --- a/source/blender/io/usd/intern/usd_reader_curve.cc +++ b/source/blender/io/usd/intern/usd_reader_curve.cc @@ -108,11 +108,11 @@ void USDCurvesReader::read_curve_sample(Curve *cu, const double motionSampleTime * Perhaps to be replaced by Blender/USD Schema. */ if (!usdNormals.empty()) { /* Set extrusion to 1.0f. */ - curve_->ext1 = 1.0f; + curve_->extrude = 1.0f; } else { /* Set bevel depth to 1.0f. */ - curve_->ext2 = 1.0f; + curve_->bevel_radius = 1.0f; } size_t idx = 0; @@ -164,7 +164,7 @@ void USDCurvesReader::read_curve_sample(Curve *cu, const double motionSampleTime bp->f1 = SELECT; bp->weight = weight; - float radius = curve_->width; + float radius = curve_->offset; if (idx < usdWidths.size()) { radius = usdWidths[idx]; } diff --git a/source/blender/io/usd/intern/usd_reader_nurbs.cc b/source/blender/io/usd/intern/usd_reader_nurbs.cc index d6977d9c91a..8370804b776 100644 --- a/source/blender/io/usd/intern/usd_reader_nurbs.cc +++ b/source/blender/io/usd/intern/usd_reader_nurbs.cc @@ -112,11 +112,11 @@ void USDNurbsReader::read_curve_sample(Curve *cu, const double motionSampleTime) * Perhaps to be replaced by Blender USD Schema. */ if (!usdNormals.empty()) { /* Set extrusion to 1. */ - curve_->ext1 = 1.0f; + curve_->extrude = 1.0f; } else { /* Set bevel depth to 1. */ - curve_->ext2 = 1.0f; + curve_->bevel_radius = 1.0f; } size_t idx = 0; |