diff options
| author | Enrico Turri <enricoturri@seznam.cz> | 2020-02-13 15:24:52 +0300 |
|---|---|---|
| committer | Enrico Turri <enricoturri@seznam.cz> | 2020-02-13 15:24:52 +0300 |
| commit | 4a59a45d512827175bf70b4d1791f46232e747db (patch) | |
| tree | 7c14261179259f83ad254b2a522cf8996c2f9b1c /src/slic3r/GUI/GLCanvas3D.hpp | |
| parent | c4c2cf4ead5f671ebef932ee03b2d658e38f9bea (diff) | |
ENABLE_SHOW_SCENE_LABELS set as default
Diffstat (limited to 'src/slic3r/GUI/GLCanvas3D.hpp')
| -rw-r--r-- | src/slic3r/GUI/GLCanvas3D.hpp | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/src/slic3r/GUI/GLCanvas3D.hpp b/src/slic3r/GUI/GLCanvas3D.hpp index 21f3f012c..9ae127880 100644 --- a/src/slic3r/GUI/GLCanvas3D.hpp +++ b/src/slic3r/GUI/GLCanvas3D.hpp @@ -375,7 +375,6 @@ private: }; #endif // ENABLE_RENDER_STATISTICS -#if ENABLE_SHOW_SCENE_LABELS class Labels { bool m_enabled{ false }; @@ -389,7 +388,6 @@ private: bool is_shown() const { return m_shown; } void render(const std::vector<const ModelInstance*>& sorted_instances) const; }; -#endif // ENABLE_SHOW_SCENE_LABELS public: enum ECursorType : unsigned char @@ -468,9 +466,7 @@ private: mutable int m_imgui_undo_redo_hovered_pos{ -1 }; int m_selected_extruder; -#if ENABLE_SHOW_SCENE_LABELS Labels m_labels; -#endif // ENABLE_SHOW_SCENE_LABELS public: GLCanvas3D(wxGLCanvas* canvas, Bed3D& bed, Camera& camera, GLToolbar& view_toolbar); @@ -487,9 +483,7 @@ public: void set_as_dirty(); unsigned int get_volumes_count() const; -#if ENABLE_SHOW_SCENE_LABELS const GLVolumeCollection& get_volumes() const { return m_volumes; } -#endif // ENABLE_SHOW_SCENE_LABELS void reset_volumes(); int check_volumes_outside_state() const; @@ -501,9 +495,7 @@ public: void set_config(const DynamicPrintConfig* config); void set_process(BackgroundSlicingProcess* process); void set_model(Model* model); -#if ENABLE_SHOW_SCENE_LABELS const Model* get_model() const { return m_model; } -#endif // ENABLE_SHOW_SCENE_LABELS const Selection& get_selection() const { return m_selection; } Selection& get_selection() { return m_selection; } @@ -551,9 +543,7 @@ public: void enable_main_toolbar(bool enable); void enable_undoredo_toolbar(bool enable); void enable_dynamic_background(bool enable); -#if ENABLE_SHOW_SCENE_LABELS void enable_labels(bool enable) { m_labels.enable(enable); } -#endif // ENABLE_SHOW_SCENE_LABELS void allow_multisample(bool allow); void zoom_to_bed(); @@ -675,10 +665,8 @@ public: void mouse_up_cleanup(); -#if ENABLE_SHOW_SCENE_LABELS bool are_labels_shown() const { return m_labels.is_shown(); } void show_labels(bool show) { m_labels.show(show); } -#endif // ENABLE_SHOW_SCENE_LABELS private: bool _is_shown_on_screen() const; |