3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed regression in invalidation of slicing steps.

Browse Source
This commit is contained in:
bubnikv 2017-06-08 17:46:28 +02:00
parent 89dcd3e8b1
commit dd41406a55
1 changed files with 17 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
xs/src/libslic3r/PrintObject.cpp
View File

@ -91,7 +91,9 @@ bool PrintObject::set_copies(const Points &points)
this->_shifted_copies.push_back(copy); this->_shifted_copies.push_back(copy);
} }
return this->_print->invalidate_step(psSkirt) || this->_print->invalidate_step(psBrim); bool invalidated = this->_print->invalidate_step(psSkirt);
invalidated |= this->_print->invalidate_step(psBrim);
return invalidated;
} }
bool PrintObject::reload_model_instances() bool PrintObject::reload_model_instances()
@ -137,6 +139,7 @@ bool PrintObject::invalidate_state_by_config_options(const std::vector<t_config_
return false; return false;
std::vector<PrintObjectStep> steps; std::vector<PrintObjectStep> steps;
bool invalidated = false;
for (const t_config_option_key &opt_key : opt_keys) { for (const t_config_option_key &opt_key : opt_keys) {
if ( opt_key == "perimeters" if ( opt_key == "perimeters"
|| opt_key == "extra_perimeters" || opt_key == "extra_perimeters"
@ -232,11 +235,11 @@ bool PrintObject::invalidate_state_by_config_options(const std::vector<t_config_
} else { } else {
// for legacy, if we can't handle this option let's invalidate all steps // for legacy, if we can't handle this option let's invalidate all steps
this->reset_layer_height_profile(); this->reset_layer_height_profile();
return this->invalidate_all_steps(); this->invalidate_all_steps();
invalidated = true;
} }
} }
bool invalidated = false;
sort_remove_duplicates(steps); sort_remove_duplicates(steps);
for (PrintObjectStep step : steps) for (PrintObjectStep step : steps)
invalidated |= this->invalidate_step(step); invalidated |= this->invalidate_step(step);
@ -249,25 +252,20 @@ bool PrintObject::invalidate_step(PrintObjectStep step)
// propagate to dependent steps // propagate to dependent steps
if (step == posPerimeters) { if (step == posPerimeters) {
invalidated |= invalidated |= this->invalidate_step(posPrepareInfill);
this->invalidate_step(posPrepareInfill) || invalidated |= this->_print->invalidate_step(psSkirt);
this->_print->invalidate_step(psSkirt) || invalidated |= this->_print->invalidate_step(psBrim);
this->_print->invalidate_step(psBrim);
} else if (step == posPrepareInfill) { } else if (step == posPrepareInfill) {
invalidated |= invalidated |= this->invalidate_step(posInfill);
this->invalidate_step(posInfill);
} else if (step == posInfill) { } else if (step == posInfill) {
invalidated |= invalidated |= this->_print->invalidate_step(psSkirt);
this->_print->invalidate_step(psSkirt) || invalidated |= this->_print->invalidate_step(psBrim);
this->_print->invalidate_step(psBrim);
} else if (step == posSlice) { } else if (step == posSlice) {
invalidated |= invalidated |= this->invalidate_step(posPerimeters);
this->invalidate_step(posPerimeters) || invalidated |= this->invalidate_step(posSupportMaterial);
this->invalidate_step(posSupportMaterial);
} else if (step == posSupportMaterial) { } else if (step == posSupportMaterial) {
invalidated |= invalidated |= this->_print->invalidate_step(psSkirt);
this->_print->invalidate_step(psSkirt) || invalidated |= this->_print->invalidate_step(psBrim);
this->_print->invalidate_step(psBrim);
} }
// Wipe tower depends on the ordering of extruders, which in turn depends on everything. // Wipe tower depends on the ordering of extruders, which in turn depends on everything.