diff options
| author | Lukas Matena <lukasmatena@seznam.cz> | 2020-01-21 15:00:07 +0300 |
|---|---|---|
| committer | Lukas Matena <lukasmatena@seznam.cz> | 2020-01-21 15:00:07 +0300 |
| commit | 63b0eec5a94c55ab5040cbd4ee235a95a6858e14 (patch) | |
| tree | a6e27921c783441eea3d30a05cf2312da82233a6 /src/slic3r/GUI/Plater.hpp | |
| parent | 87f2578ee71c9baa13dcfc09c1afb4d751cb2ed3 (diff) | |
| parent | 05ea01bdcccb3d8bc5d46b71c20a30e25352cea8 (diff) | |
Merge branch 'master' into lm_tm_hollowing
Diffstat (limited to 'src/slic3r/GUI/Plater.hpp')
| -rw-r--r-- | src/slic3r/GUI/Plater.hpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/slic3r/GUI/Plater.hpp b/src/slic3r/GUI/Plater.hpp index 774875cd7..591f49378 100644 --- 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; |