Merge pull request #142 from ebirenbaum/animation-sampler-interpolation

Change AnimationSampler::interpolation to a non-required field.
This commit is contained in:
Syoyo Fujita 2019-02-15 14:04:06 +09:00 committed by GitHub
commit 7ece5c8275
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -3263,13 +3263,8 @@ static bool ParseAnimation(Animation *animation, std::string *err,
}
return false;
}
if (!ParseStringProperty(&sampler.interpolation, err, s,
"interpolation", true)) {
if (err) {
(*err) += "`interpolation` field is missing in animation.sampler\n";
}
return false;
}
ParseStringProperty(&sampler.interpolation, err, s, "interpolation",
false);
if (!ParseNumberProperty(&outputIndex, err, s, "output", true)) {
if (err) {
(*err) += "`output` field is missing in animation.sampler\n";