merge with dev

rtgui/paramsedited.h

@@ -279,6 +279,7 @@ struct ColorAppearanceParamsEdited {
     bool ybscen;
     bool badpixsl;
     bool wbmodel;
+    bool illum;
     bool algo;
     bool jlight;
     bool qbright;
@@ -294,10 +295,12 @@ struct ColorAppearanceParamsEdited {
     bool datacie;
     bool tonecie;
     bool tempout;
+    bool autotempout;
     bool greenout;
     bool ybout;
     bool tempsc;
     bool greensc;
+    bool presetcat02;
 };
 
 struct DirPyrDenoiseParamsEdited {
@@ -943,7 +946,9 @@ struct WaveletParamsEdited {
     bool cbenab;
     bool lipst;
     bool Medgreinf;
+    bool ushamethod;
     bool avoid;
+    bool showmask;
     bool tmr;
     bool c[9];
     bool ch[9];
@@ -960,10 +965,13 @@ struct WaveletParamsEdited {
     bool Tilesmethod;
     bool daubcoeffmethod;
     bool Dirmethod;
+    bool sigma;
     bool rescon;
     bool resconH;
     bool reschro;
     bool tmrs;
+    bool edgs;
+    bool scale;
     bool gamma;
     bool sup;
     bool sky;
@@ -983,6 +991,7 @@ struct WaveletParamsEdited {
     bool edgthresh;
     bool thr;
     bool thrH;
+    bool radius;
     bool skinprotect;
     bool hueskin;
     bool hueskin2;
@@ -1009,6 +1018,10 @@ struct WaveletParamsEdited {
     bool bluemed;
     bool greenhigh;
     bool bluehigh;
+    bool mergeL;
+    bool mergeC;
+    bool softrad;
+    bool softradend;
     bool expcontrast;
     bool expchroma;
     bool expedge;
@@ -1016,6 +1029,7 @@ struct WaveletParamsEdited {
     bool expfinal;
     bool exptoning;
     bool expnoise;
+    bool expclari;
 };
 
 struct DirPyrEqualizerParamsEdited {