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

Merge branch 'dev' of https://github.com/prusa3d/PrusaSlicer into et_reload_from_disk

Browse source
This commit is contained in:
Enrico Turri 2019-09-06 16:06:37 +02:00
commit 9cf3793aac
19 changed files with 238 additions and 240 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/slic3r/GUI/GLCanvas3D.cpp
View file

@ -60,10 +60,6 @@
#endif // ENABLE_RENDER_STATISTICS
static const float TRACKBALLSIZE = 0.8f;
static const float GROUND_Z = -0.02f;
static const float GIZMO_RESET_BUTTON_HEIGHT = 22.0f;
static const float GIZMO_RESET_BUTTON_WIDTH = 70.f;
static const float DEFAULT_BG_DARK_COLOR[3] = { 0.478f, 0.478f, 0.478f };
static const float DEFAULT_BG_LIGHT_COLOR[3] = { 0.753f, 0.753f, 0.753f };