3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-11 08:47:52 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fixed conflicts after merge with master

Browse source
This commit is contained in:
enricoturri1966 2020-09-08 15:38:35 +02:00
commit 8cb2636afc
19 changed files with 297 additions and 81 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/slic3r/GUI/Plater.cpp
View file

@ -2835,7 +2835,7 @@ unsigned int Plater::priv::update_background_process(bool force_validation, bool
if (this->preview != nullptr) {
// If the preview is not visible, the following line just invalidates the preview,
// but the G-code paths or SLA preview are calculated first once the preview is made visible.
this->preview->get_canvas3d()->reset_gcode_toolpaths();
reset_gcode_toolpaths();
this->preview->reload_print();
}
#else
@ -5408,7 +5408,8 @@ void Plater::on_config_change(const DynamicPrintConfig &config)
this->set_printer_technology(config.opt_enum<PrinterTechnology>(opt_key));
// print technology is changed, so we should to update a search list
p->sidebar->update_searcher();
}
p->reset_gcode_toolpaths();
}
else if ((opt_key == "bed_shape") || (opt_key == "bed_custom_texture") || (opt_key == "bed_custom_model")) {
bed_shape_changed = true;
update_scheduled = true;