public_mirrors/OrcaSlicer-bambulab
1
0
Fork 0
mirror of https://github.com/FULU-Foundation/OrcaSlicer-bambulab.git synced 2026-07-26 10:25:49 +00:00
Code Issues Activity

Fixed conflicts after merge with master

Browse Source
This commit is contained in:
enricoturri1966
2020-08-04 09:58:19 +02:00
parent 0840b2328a e79382c3f6
commit 25c3552555
68 changed files with 4042 additions and 1798 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/slic3r/GUI/GUI_App.hpp
+3
View File
@@ -198,12 +198,15 @@ public:
Plater* plater();
Model& model();
AppConfig* app_config{ nullptr };
PresetBundle* preset_bundle{ nullptr };
PresetUpdater* preset_updater{ nullptr };
MainFrame* mainframe{ nullptr };
Plater* plater_{ nullptr };
PresetUpdater* get_preset_updater() { return preset_updater; }
wxNotebook* tab_panel() const ;
int extruders_cnt() const;
int extruders_edited_cnt() const;