3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-11 00:37:51 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge remote-tracking branch 'origin/master' into ys_hdpi

Browse source
This commit is contained in:
YuSanka 2019-02-06 11:12:44 +01:00
commit b2410e0f23
51 changed files with 7406 additions and 275 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/slic3r/GUI/GUI_App.cpp
View file

@ -197,7 +197,7 @@ bool GUI_App::OnInit()
mainframe->Show(true);
return true;
return m_initialized = true;
}
unsigned GUI_App::get_colour_approx_luma(const wxColour &colour)