pengo1998/OrcaSlicer-bambulab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed conflict after merge with master

Browse Source
This commit is contained in:
Enrico Turri
2018-07-27 12:15:35 +02:00
parent ddda5062c2 987fc4c6df
commit 590773d77b
18 changed files with 4553 additions and 2760 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
xs/src/slic3r/GUI/GLCanvas3DManager.hpp
View File

@@ -115,6 +115,7 @@ public:
//###################################################################################################################################
void enable_shader(wxGLCanvas* canvas, bool enable);
void enable_force_zoom_to_bed(wxGLCanvas* canvas, bool enable);
void enable_dynamic_background(wxGLCanvas* canvas, bool enable);
void allow_multisample(wxGLCanvas* canvas, bool allow);
//###################################################################################################################################
@@ -140,10 +141,8 @@ public:
void reload_scene(wxGLCanvas* canvas, bool force);
void load_print_toolpaths(wxGLCanvas* canvas);
void load_print_object_toolpaths(wxGLCanvas* canvas, const PrintObject* print_object, const std::vector<std::string>& tool_colors);
void load_wipe_tower_toolpaths(wxGLCanvas* canvas, const std::vector<std::string>& str_tool_colors);
void load_gcode_preview(wxGLCanvas* canvas, const GCodePreviewData* preview_data, const std::vector<std::string>& str_tool_colors);
void load_preview(wxGLCanvas* canvas, const std::vector<std::string>& str_tool_colors);
void reset_legend_texture();