creyD/intelliphoto
1
0
Fork 0
mirror of https://github.com/creyD/intelliphoto.git synced 2026-04-15 21:00:37 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'Helper_Variablen' into 'dev-stupidrenderer'

Browse Source 
# Conflicts:
#   src/Image/IntelliImage.h
#   src/IntelliPhoto.pro
#   src/Layer/PaintingArea.h
This commit is contained in:
Bastian Schindler
2020-01-09 00:10:40 +00:00
parent 73500db171 e4f094330e
commit 4a6098856f
14 changed files with 111 additions and 204 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Layer/PaintingArea.h
View File

@@ -12,7 +12,6 @@
#include "Image/IntelliShapedImage.h"
#include "Tool/IntelliTool.h"
#include "IntelliHelper/IntelliColorPicker.h"
#include "IntelliHelper/IntelliRenderSettings.h"
/*!
* \brief The LayerObject struct holds all the information needed to construct a layer
@@ -166,6 +165,8 @@ public:
std::vector<QPoint> getPolygonDataOfRealLayer();
int getNumberOfActiveLayer();
IntelliToolsettings Toolsettings;
IntelliColorPicker colorPicker;