merge 'soft-light' into 'dev'

2018-06-29 23:34:31 +02:00
parent 192e29416a 112de05700
commit 7b0383fd2f
19 changed files with 330 additions and 2 deletions
--- a/rtgui/toolpanelcoord.h
+++ b/rtgui/toolpanelcoord.h
@@ -79,6 +79,7 @@
 #include "prsharpening.h"
 #include "fattaltonemap.h"
 #include "localcontrast.h"
+#include "softlight.h"
 #include "guiutils.h"

 class ImageEditorCoordinator;
@@ -134,6 +135,7 @@ protected:
    Wavelet * wavelet;
    DirPyrEqualizer* dirpyrequalizer;
    HSVEqualizer* hsvequalizer;
+    SoftLight *softlight;
    FilmSimulation *filmSimulation;
    SensorBayer * sensorbayer;
    SensorXTrans * sensorxtrans;