Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_selection_rectangle

This commit is contained in:
Enrico Turri 2019-04-26 13:38:34 +02:00
commit 6f273bef7f
4 changed files with 34 additions and 8 deletions

View file

@ -353,7 +353,7 @@ class GLCanvas3D
void render(const GLCanvas3D& canvas) const;
// function used to get an information for rescaling of the warning
void rescale(const GLCanvas3D& canvas);
void msw_rescale(const GLCanvas3D& canvas);
private:
static const unsigned char Background_Color[3];