Merge branch 'master' into lm_tm_hollowing

2020-01-21 13:00:07 +01:00
parent 87f2578ee7 05ea01bdcc
commit 63b0eec5a9
104 changed files with 3378 additions and 2140 deletions
--- a/src/slic3r/GUI/Plater.hpp
+++ b/src/slic3r/GUI/Plater.hpp
@@ -267,9 +267,7 @@ public:

    void msw_rescale();

-#if ENABLE_VIEW_TOOLBAR_BACKGROUND_FIX
    bool init_view_toolbar();
-#endif // ENABLE_VIEW_TOOLBAR_BACKGROUND_FIX

    const Camera& get_camera() const;
    const Mouse3DController& get_mouse3d_controller() const;