Merge branch 'dev-stupidrenderer' into 'Helper_Variablen'

Merge Meine und Jans Arbeit

See merge request creyd/intelliphoto!31

src/Image/IntelliImage.h

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

src/IntelliPhoto.pro

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

src/Layer/PaintingArea.h

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