diff options
| author | bubnikv <bubnikv@gmail.com> | 2019-07-04 21:22:15 +0300 |
|---|---|---|
| committer | bubnikv <bubnikv@gmail.com> | 2019-07-04 21:22:15 +0300 |
| commit | c7cc76006706fefef52060a2165708c233dbadfd (patch) | |
| tree | afa1f11f7643f12c9a1a698be34b6ab33707604c /src/slic3r/GUI/Selection.hpp | |
| parent | 1070991149b5279f96fb4365094c6eec98d9243f (diff) | |
| parent | f617d747293de0e0bbb500ced8c4a66cdbdadf24 (diff) | |
Merge remote-tracking branch 'origin/master' into vb_undo_redo
Diffstat (limited to 'src/slic3r/GUI/Selection.hpp')
| -rw-r--r-- | src/slic3r/GUI/Selection.hpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/slic3r/GUI/Selection.hpp b/src/slic3r/GUI/Selection.hpp index 35336c2b3..705ed4c73 100644 --- a/src/slic3r/GUI/Selection.hpp +++ b/src/slic3r/GUI/Selection.hpp @@ -11,8 +11,8 @@ typedef class GLUquadric GLUquadricObj; #endif // ENABLE_RENDER_SELECTION_CENTER namespace Slic3r { +class Shader; namespace GUI { - class TransformationType { public: @@ -305,7 +305,7 @@ public: #if ENABLE_RENDER_SELECTION_CENTER void render_center(bool gizmo_is_dragging) const; #endif // ENABLE_RENDER_SELECTION_CENTER - void render_sidebar_hints(const std::string& sidebar_field) const; + void render_sidebar_hints(const std::string& sidebar_field, const Shader& shader) const; bool requires_local_axes() const; @@ -335,6 +335,7 @@ private: void render_sidebar_rotation_hints(const std::string& sidebar_field) const; void render_sidebar_scale_hints(const std::string& sidebar_field) const; void render_sidebar_size_hints(const std::string& sidebar_field) const; + void render_sidebar_layers_hints(const std::string& sidebar_field) const; void render_sidebar_position_hint(Axis axis) const; void render_sidebar_rotation_hint(Axis axis) const; void render_sidebar_scale_hint(Axis axis) const; |