blender
/
blender
136
404
Fork 586
Code Issues 6.2k Pull Requests 752 Projects 19 Wiki Activity

Cleanup: FIx build with USD after recent refactor 

rB218360a89217f4e8321319035bf4d9ff97fb2658 missed a couple renames in USD code paths.
This commit is contained in:
Aaron Carlisle 2021-12-01 23:34:51 -05:00
parent bb3d03973a
commit 0de1d2e84e
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/io/usd/intern/usd_reader_curve.cc
View File

@ -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];
}

4
source/blender/io/usd/intern/usd_reader_nurbs.cc
View File

@ -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;