3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-25 15:44:12 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'master' of https://github.com/prusa3d/Slic3r

Browse source
This commit is contained in:
bubnikv 2019-03-14 12:10:37 +01:00
commit 6f2695366e
4 changed files with 11 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/libslic3r/PrintConfig.cpp
View file

@ -405,7 +405,7 @@ void PrintConfigDef::init_fff_params()
def = this->add("bottom_fill_pattern", coEnum);
*def = *def_top_fill_pattern;
def->label = L("Bottom Pattern");
def->label = L("Bottom fill pattern");
def->tooltip = L("Fill pattern for bottom infill. This only affects the bottom external visible layer, and not its adjacent solid shells.");
def->cli = "bottom-fill-pattern|external-fill-pattern|solid-fill-pattern";
def->default_value = new ConfigOptionEnum<InfillPattern>(ipRectilinear);

5
src/libslic3r/SLA/SLASupportTree.cpp
View file

@ -1411,10 +1411,11 @@ public:
using libnest2d::opt::GeneticOptimizer;
using libnest2d::opt::StopCriteria;
for(unsigned i = 0, fidx = filtered_indices[0];
i < filtered_indices.size(); ++i, fidx = filtered_indices[i])
for(unsigned i = 0, fidx = 0; i < filtered_indices.size(); ++i)
{
m_thr();
fidx = filtered_indices[i];
auto n = nmls.row(i);
// for all normals we generate the spherical coordinates and