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

Fixed conflicts after merge with master

Browse source
This commit is contained in:
enricoturri1966 2020-11-25 12:42:26 +01:00
commit f0aa4de20a
39 changed files with 467 additions and 402 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/slic3r/GUI/Plater.cpp
View file

@ -439,6 +439,9 @@ FreqChangedParams::FreqChangedParams(wxWindow* parent) :
m_og->activate();
Choice* choice = dynamic_cast<Choice*>(m_og->get_field("support"));
choice->suppress_scroll();
// Frequently changed parameters for SLA_technology
m_og_sla = std::make_shared<ConfigOptionsGroup>(parent, "");
m_og_sla->hide_labels();