Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_gcode_viewer

This commit is contained in:
enricoturri1966 2020-05-22 12:12:56 +02:00
commit 80c2f107c1
28 changed files with 1208 additions and 52 deletions

View file

@ -105,6 +105,7 @@ public:
void update_mode_sizer() const;
void update_reslice_btn_tooltip() const;
void msw_rescale();
void sys_color_changed();
void search();
void jump_to_option(size_t selected);
@ -308,6 +309,7 @@ public:
bool can_reload_from_disk() const;
void msw_rescale();
void sys_color_changed();
bool init_view_toolbar();