Merge branch 'dev' into hidpi-icons

2019-03-13 01:00:14 +01:00
parent 4c904967b2 86690f1ca0
commit 52dcd08b97
165 changed files with 2388 additions and 1653 deletions
--- a/rtgui/previewwindow.cc
+++ b/rtgui/previewwindow.cc
@@ -21,6 +21,8 @@
 #include "imagearea.h"
 #include "cursormanager.h"

+#include "../rtengine/procparams.h"
+
 PreviewWindow::PreviewWindow () : previewHandler(nullptr), mainCropWin(nullptr), imageArea(nullptr), imgX(0), imgY(0), imgW(0), imgH(0),
    zoom(0.0), press_x(0), press_y(0), isMoving(false), needsUpdate(false), cursor_type(CSUndefined)