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

Fixing conflicts part 1:

Browse source 
fixed simple conflicts
This commit is contained in:
Lukas Matena 2022-06-29 15:05:25 +02:00
parent b61714bb3e
commit 62e59a4526
14 changed files with 4 additions and 571 deletions
src/libslic3r/Fill
Fill.cpp

7
src/libslic3r/Fill/Fill.cpp
View file

@ -13,10 +13,8 @@
#include "FillBase.hpp"
#include "FillRectilinear.hpp"
#include "FillLightning.hpp"
<<<<<<< HEAD
=======
#include "FillConcentric.hpp"
>>>>>>> master_250
namespace Slic3r {
@ -358,8 +356,6 @@ void Layer::make_fills(FillAdaptive::Octree* adaptive_fill_octree, FillAdaptive:
if (surface_fill.params.pattern == ipLightning)
dynamic_cast<FillLightning::Filler*>(f.get())->generator = lightning_generator;
<<<<<<< HEAD
=======
if (perimeter_generator.value == PerimeterGeneratorType::Arachne && surface_fill.params.pattern == ipConcentric) {
FillConcentric *fill_concentric = dynamic_cast<FillConcentric *>(f.get());
assert(fill_concentric != nullptr);
@ -367,7 +363,6 @@ void Layer::make_fills(FillAdaptive::Octree* adaptive_fill_octree, FillAdaptive:
fill_concentric->print_object_config = &this->object()->config();
}
>>>>>>> master_250
// calculate flow spacing for infill pattern generation
bool using_internal_flow = ! surface_fill.surface.is_solid() && ! surface_fill.params.bridge;
double link_max_length = 0.;