juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-05-20 11:53:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed previous merge

Browse Source
This commit is contained in:
Vojtech Bubnik
2020-12-14 12:49:16 +01:00
parent e90120994e
commit 12303d93d5
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/libslic3r/PrintConfig.cpp
View File

@@ -193,11 +193,7 @@ void PrintConfigDef::init_fff_params()
def->sidetext = L("mm (zero to disable)"); def->sidetext = L("mm (zero to disable)");
def->min = 0; def->min = 0;
def->mode = comExpert; def->mode = comExpert;
<<<<<<< HEAD
def->set_default_value(new ConfigOptionFloatOrPercent(0., false)); def->set_default_value(new ConfigOptionFloatOrPercent(0., false));
=======
def->set_default_value(new ConfigOptionFloatOrPercent(0.));
>>>>>>> 530148575b06fbf423166ced0d57c7b9eeca1dd4
def = this->add("bed_temperature", coInts); def = this->add("bed_temperature", coInts);
def->label = L("Other layers"); def->label = L("Other layers");