creyD/intelliphoto
1
0
Fork 0
mirror of https://github.com/creyD/intelliphoto.git synced 2026-04-13 20:00:32 +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-08 23:47:37 +00:00
parent 7ed8e858af 540e23aadf
commit 9af9969c2f
38 changed files with 1311 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/Image/IntelliImage.h
View File

@@ -8,8 +8,11 @@
#include <QWidget>
#include <vector>
#include "IntelliHelper/IntelliHelper.h"
<<<<<<< src/Image/IntelliImage.h
#include "IntelliHelper/IntelliRenderSettings.h"
=======
#include "IntelliHelper/IntelliTriangulation.h"
>>>>>>> src/Image/IntelliImage.h
class IntelliTool;