mirror of
https://github.com/SoftFever/OrcaSlicer.git
synced 2025-07-10 08:17:51 -06:00
Fixed conflicts after merge with master
This commit is contained in:
commit
2f8970de86
60 changed files with 15028 additions and 13576 deletions
|
@ -145,6 +145,9 @@ DPIFrame(NULL, wxID_ANY, "", wxDefaultPosition, wxDefaultSize, wxDEFAULT_FRAME_S
|
|||
wxGetApp().persist_window_geometry(this, true);
|
||||
|
||||
update_ui_from_settings(); // FIXME (?)
|
||||
|
||||
if (m_plater != nullptr)
|
||||
m_plater->show_action_buttons(true);
|
||||
}
|
||||
|
||||
void MainFrame::update_title()
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue