diff options
author | Lukas Matena <lukasmatena@seznam.cz> | 2019-12-12 13:37:33 +0300 |
---|---|---|
committer | Lukas Matena <lukasmatena@seznam.cz> | 2019-12-12 13:37:33 +0300 |
commit | 537260494df5736b5a36677b86cf04c364fbf831 (patch) | |
tree | 838db423c8bc7f4d3594267398c6ad2b2c591d89 /src/slic3r/GUI/Plater.hpp | |
parent | 135660decfd2cdb6d8b26059c05fa084e399bff2 (diff) | |
parent | c284a65caaa6d859164c33f858512d7d8d3d0f5c (diff) |
Merge branch 'master' into lm_tm_hollowing
Diffstat (limited to 'src/slic3r/GUI/Plater.hpp')
-rw-r--r-- | src/slic3r/GUI/Plater.hpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/slic3r/GUI/Plater.hpp b/src/slic3r/GUI/Plater.hpp index 50a4d1f17..730ba1097 100644 --- a/src/slic3r/GUI/Plater.hpp +++ b/src/slic3r/GUI/Plater.hpp @@ -41,6 +41,7 @@ class ObjectSettings; class ObjectLayers; class ObjectList; class GLCanvas3D; +class Mouse3DController; using t_optgroups = std::vector <std::shared_ptr<ConfigOptionsGroup>>; @@ -223,6 +224,7 @@ public: void on_activate(); const DynamicPrintConfig* get_plater_config() const; std::vector<std::string> get_extruder_colors_from_plater_config() const; + std::vector<std::string> get_colors_for_color_print() const; void update_object_menu(); @@ -260,7 +262,13 @@ 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; + Mouse3DController& get_mouse3d_controller(); // ROII wrapper for suppressing the Undo / Redo snapshot to be taken. class SuppressSnapshots |