Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_gcode_viewer

2020-04-28 10:29:44 +02:00
parent 1cb0f044db 2bd524849a
commit a00c391f0f
14 changed files with 380 additions and 54 deletions
--- a/src/slic3r/GUI/GLCanvas3D.hpp
+++ b/src/slic3r/GUI/GLCanvas3D.hpp
@@ -795,7 +795,7 @@ private:
    void _picking_pass() const;
    void _rectangular_selection_picking_pass() const;
    void _render_background() const;
-    void _render_bed(float theta, bool show_axes) const;
+    void _render_bed(bool bottom, bool show_axes) const;
    void _render_objects() const;
 #if ENABLE_GCODE_VIEWER
    void _render_gcode() const;