GitHub-Proxy/Slic3r
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/slic3r/Slic3r.git synced 2025-08-14 19:26:03 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Call correct infill function and move a brace

Browse Source
This commit is contained in:
Joseph Lenox 2018-07-21 16:01:01 -05:00
parent bce4f19111
commit ed73443b5d
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
xs/src/libslic3r/Print.cpp
View File

@ -97,9 +97,13 @@ Print::delete_object(size_t idx)
void void
Print::process() Print::process()
{ {
/// No need to call this as we call it as part of prepare_infill()
/// until we fix the idempotency issue.
///$self->status_cb->(20, "Generating perimeters");
///$_->make_perimeters for @{$self->objects};
if (this->status_cb != nullptr) if (this->status_cb != nullptr)
this->status_cb(70, "Infilling layers"); this->status_cb(70, "Infilling layers");
for(auto& obj : this->objects) { obj->_infill(); } for(auto& obj : this->objects) { obj->infill(); }
for(auto& obj : this->objects) { obj->generate_support_material(); } for(auto& obj : this->objects) { obj->generate_support_material(); }
this->make_skirt(); this->make_skirt();
@ -159,7 +163,8 @@ Print::make_skirt()
for (const auto& object : this->objects) { for (const auto& object : this->objects) {
size_t skirt_height { size_t skirt_height {
this->has_infinite_skirt() ? object->layer_count() : this->has_infinite_skirt() ? object->layer_count() :
std::min(size_t(this->config.skirt_height()), object->layer_count())}; std::min(size_t(this->config.skirt_height()), object->layer_count())
};
std::cerr << object->layer_count(); std::cerr << object->layer_count();
auto* highest_layer {object->get_layer(skirt_height - 1)}; auto* highest_layer {object->get_layer(skirt_height - 1)};
skirt_height_z = std::max(skirt_height_z, highest_layer->print_z); skirt_height_z = std::max(skirt_height_z, highest_layer->print_z);