diff options
| author | Enrico Turri <enricoturri@seznam.cz> | 2019-07-08 10:23:37 +0300 |
|---|---|---|
| committer | Enrico Turri <enricoturri@seznam.cz> | 2019-07-08 10:23:37 +0300 |
| commit | 9ba5568539607a2b7edb73c13b8e2271e63382dd (patch) | |
| tree | c1d57bdf194f282ba70c4d3ad83eb3747a145b1f /src/slic3r/GUI/Selection.hpp | |
| parent | d15698e21e86a4e896bbb5f3c59440ec2dc721e9 (diff) | |
| parent | f617d747293de0e0bbb500ced8c4a66cdbdadf24 (diff) | |
Fixed conflicts after merge with master
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 482a8309f..4674a4804 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: @@ -302,7 +302,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; @@ -332,6 +332,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; |