diff options
| author | Siddhartha Jejurkar <f20180617@goa.bits-pilani.ac.in> | 2021-12-17 16:01:32 +0300 |
|---|---|---|
| committer | Siddhartha Jejurkar <f20180617@goa.bits-pilani.ac.in> | 2021-12-17 16:01:32 +0300 |
| commit | dbc41b30f88b96f7d8c6e995b17f5930eb55cc77 (patch) | |
| tree | c6c495328443ea3621e5df2ef483b0e0dd504496 /source/blender/io/usd/intern/usd_reader_curve.cc | |
| parent | 99a2af76d10e05a18987be5d554ada197b1ca086 (diff) | |
| parent | 7c9e4099854a4fc8eab4db97173c1aacd25f9e08 (diff) | |
Merge branch 'master' into soc-2021-uv-edge-select-supportsoc-2021-uv-edge-select-support
Diffstat (limited to 'source/blender/io/usd/intern/usd_reader_curve.cc')
| -rw-r--r-- | source/blender/io/usd/intern/usd_reader_curve.cc | 6 |
1 files changed, 3 insertions, 3 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]; } |