Merge branch 'dev' into dev_PolygonTool

This commit is contained in:
2019-12-19 11:31:34 +01:00
12 changed files with 179 additions and 56 deletions

View File

@@ -21,8 +21,6 @@ struct LayerObject{
int widthOffset;
int hightOffset;
int alpha=255;
};
class PaintingArea : public QWidget
@@ -87,7 +85,6 @@ private:
void activateUpperLayer();
void activateLowerLayer();
QImage* Canvas;
int maxWidth;
int maxHeight;
@@ -108,4 +105,3 @@ private:
};
#endif