merge with dev

2020-03-29 18:31:52 +02:00
parent 821abcc706 bae1897b44
commit c062d654bb
17 changed files with 705 additions and 87 deletions
--- a/rtgui/paramsedited.h
+++ b/rtgui/paramsedited.h
@@ -971,6 +971,8 @@ struct WaveletParamsEdited {
    bool rescon;
    bool resconH;
    bool reschro;
+    bool resblur;
+    bool resblurc;
    bool tmrs;
    bool edgs;
    bool scale;
@@ -1000,11 +1002,14 @@ struct WaveletParamsEdited {
    bool hllev;
    bool bllev;
    bool edgcont;
+    bool chrwav;
+    bool bluwav;
    bool level0noise;
    bool level1noise;
    bool level2noise;
    bool level3noise;
    bool ccwcurve;
+    bool blcurve;
    bool opacityCurveBY;
    bool opacityCurveRG;
    bool opacityCurveW;
@@ -1027,6 +1032,7 @@ struct WaveletParamsEdited {
    bool expcontrast;
    bool expchroma;
    bool expedge;
+    bool expbl;
    bool expresid;
    bool expfinal;
    bool exptoning;