Skip to content

Commit

Permalink
Merge remote-tracking branch 'remotes/remi/master' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
supermerill committed Oct 5, 2020
2 parents 7c80b31 + 3453216 commit c6331e4
Showing 1 changed file with 1 addition and 7 deletions.
8 changes: 1 addition & 7 deletions src/libslic3r/PrintConfig.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4982,20 +4982,14 @@ std::string FullPrintConfig::validate()
out_of_range = fopt->get_abs_value(1) < optdef->min || fopt->get_abs_value(1) > optdef->max;
break;
}
case coPercents:
case coFloats:
for (double v : static_cast<const ConfigOptionVector<double>*>(opt)->values)
if (v < optdef->min || v > optdef->max) {
out_of_range = true;
break;
}
break;
case coPercents:
for (double v : static_cast<const ConfigOptionVector<double>*>(opt)->values)
if (v*0.01 < optdef->min || v * 0.01 > optdef->max) {
out_of_range = true;
break;
}
break;
case coInt:
{
auto *iopt = static_cast<const ConfigOptionInt*>(opt);
Expand Down

0 comments on commit c6331e4

Please sign in to comment.