diff options
| author | Lukas Matena <lukasmatena@seznam.cz> | 2020-01-21 15:00:07 +0300 |
|---|---|---|
| committer | Lukas Matena <lukasmatena@seznam.cz> | 2020-01-21 15:00:07 +0300 |
| commit | 63b0eec5a94c55ab5040cbd4ee235a95a6858e14 (patch) | |
| tree | a6e27921c783441eea3d30a05cf2312da82233a6 /src/slic3r/GUI/MainFrame.cpp | |
| parent | 87f2578ee71c9baa13dcfc09c1afb4d751cb2ed3 (diff) | |
| parent | 05ea01bdcccb3d8bc5d46b71c20a30e25352cea8 (diff) | |
Merge branch 'master' into lm_tm_hollowing
Diffstat (limited to 'src/slic3r/GUI/MainFrame.cpp')
| -rw-r--r-- | src/slic3r/GUI/MainFrame.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/slic3r/GUI/MainFrame.cpp b/src/slic3r/GUI/MainFrame.cpp index 4ae03792b..d1466ef0b 100644 --- a/src/slic3r/GUI/MainFrame.cpp +++ b/src/slic3r/GUI/MainFrame.cpp @@ -125,7 +125,7 @@ DPIFrame(NULL, wxID_ANY, "", wxDefaultPosition, wxDefaultSize, wxDEFAULT_FRAME_S _3DScene::remove_all_canvases(); // Slic3r::GUI::deregister_on_request_update_callback(); - // set to null tabs and a platter + // set to null tabs and a plater // to avoid any manipulations with them from App->wxEVT_IDLE after of the mainframe closing wxGetApp().tabs_list.clear(); wxGetApp().plater_ = nullptr; @@ -1007,7 +1007,7 @@ void MainFrame::load_configbundle(wxString file/* = wxEmptyString, const bool re } // Load a provied DynamicConfig into the Print / Filament / Printer tabs, thus modifying the active preset. -// Also update the platter with the new presets. +// Also update the plater with the new presets. void MainFrame::load_config(const DynamicPrintConfig& config) { PrinterTechnology printer_technology = wxGetApp().preset_bundle->printers.get_edited_preset().printer_technology(); |