GitHub-Proxy/PrusaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git synced 2025-08-15 02:05:58 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
bubnikv 2019-03-14 16:32:22 +01:00
commit 3b38c36262
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/slic3r/GUI/GUI_ObjectList.cpp
View File

@ -44,12 +44,12 @@ static PrinterTechnology printer_technology()
} }
// Config from current edited printer preset // Config from current edited printer preset
DynamicPrintConfig& printer_config() static DynamicPrintConfig& printer_config()
{ {
return wxGetApp().preset_bundle->printers.get_edited_preset().config; return wxGetApp().preset_bundle->printers.get_edited_preset().config;
} }
int extruders_count() static int extruders_count()
{ {
return printer_technology() == ptSLA ? 1 : return printer_technology() == ptSLA ? 1 :
printer_config().option<ConfigOptionFloats>("nozzle_diameter")->values.size(); printer_config().option<ConfigOptionFloats>("nozzle_diameter")->values.size();

2
src/slic3r/GUI/Tab.cpp
View File

@ -74,7 +74,7 @@ void Tab::set_type()
void Tab::create_preset_tab() void Tab::create_preset_tab()
{ {
#ifdef __WINDOWS__ #ifdef __WINDOWS__
SetDoubleBuffered(true); // SetDoubleBuffered(true);
#endif //__WINDOWS__ #endif //__WINDOWS__
m_preset_bundle = wxGetApp().preset_bundle; m_preset_bundle = wxGetApp().preset_bundle;