Merge remote-tracking branch 'origin/dev_native' into ys_dev_native

This commit is contained in:
YuSanka
2018-10-05 23:39:51 +02:00
13 changed files with 205 additions and 91 deletions

View File

@@ -53,7 +53,7 @@ public:
Preview(wxNotebook* notebook, DynamicPrintConfig* config, Print* print, GCodePreviewData* gcode_preview_data);
virtual ~Preview();
wxGLCanvas* get_canvas() { return m_canvas; }
wxGLCanvas* get_wxglcanvas() { return m_canvas; }
void set_number_extruders(unsigned int number_extruders);
void reset_gcode_preview_data();