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

Merge branch 'dev-stupidrenderer' into 'Helper_Variablen'

Browse Source 
Merge Meine und Jans Arbeit

See merge request creyd/intelliphoto!31
This commit is contained in:
Bastian Schindler
2020-01-09 00:11:04 +00:00
parent e4f094330e 4a6098856f
commit a33041a076
3 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/Image/IntelliImage.h
View File

@@ -8,6 +8,7 @@
#include <QWidget> #include <QWidget>
#include <vector> #include <vector>
#include "IntelliHelper/IntelliRenderSettings.h"
#include "IntelliHelper/IntelliTriangulation.h" #include "IntelliHelper/IntelliTriangulation.h"
class IntelliTool; class IntelliTool;

2
src/IntelliPhoto.pro
View File

@@ -21,6 +21,7 @@ SOURCES += \
Image/IntelliRasterImage.cpp \ Image/IntelliRasterImage.cpp \
Image/IntelliShapedImage.cpp \ Image/IntelliShapedImage.cpp \
IntelliHelper/IntelliColorPicker.cpp \ IntelliHelper/IntelliColorPicker.cpp \
IntelliHelper/IntelliRenderSettings.cpp \
IntelliHelper/IntelliToolsettings.cpp \ IntelliHelper/IntelliToolsettings.cpp \
IntelliHelper/IntelliTriangulation.cpp \ IntelliHelper/IntelliTriangulation.cpp \
Layer/PaintingArea.cpp \ Layer/PaintingArea.cpp \
@@ -40,6 +41,7 @@ HEADERS += \
Image/IntelliRasterImage.h \ Image/IntelliRasterImage.h \
Image/IntelliShapedImage.h \ Image/IntelliShapedImage.h \
IntelliHelper/IntelliColorPicker.h \ IntelliHelper/IntelliColorPicker.h \
IntelliHelper/IntelliRenderSettings.h \
IntelliHelper/IntelliToolsettings.h \ IntelliHelper/IntelliToolsettings.h \
IntelliHelper/IntelliTriangulation.h \ IntelliHelper/IntelliTriangulation.h \
Layer/PaintingArea.h \ Layer/PaintingArea.h \

1
src/Layer/PaintingArea.h
View File

@@ -205,6 +205,7 @@ private:
int maxWidth; int maxWidth;
int maxHeight; int maxHeight;
IntelliRenderSettings renderSettings;
IntelliTool* Tool; IntelliTool* Tool;
std::vector<LayerObject> layerBundle; std::vector<LayerObject> layerBundle;