Merge branch 'dev' of https://github.com/Beep6581/RawTherapee into defish

rtgui/paramsedited.h

@@ -478,6 +478,7 @@ public:
         bool strcolab;
         bool strcolh;
         bool angcol;
+        bool feathercol;
         bool blurcolde;
         bool blurcol;
         bool contcol;
@@ -540,6 +541,7 @@ public:
         bool blurexpde;
         bool strexp;
         bool angexp;
+        bool featherexp;
         bool excurve;
         bool norm;
         bool inversex;
@@ -595,6 +597,7 @@ public:
         bool blurSHde;
         bool strSH;
         bool angSH;
+        bool featherSH;
         bool inverssh;
         bool chromaskSH;
         bool gammaskSH;
@@ -640,6 +643,7 @@ public:
         bool strvibab;
         bool strvibh;
         bool angvib;
+        bool feathervib;
         bool Lmaskvibcurve;
         bool recothresv;
         bool lowthresv;
@@ -856,6 +860,7 @@ public:
         bool sigmalc2;
         bool strwav;
         bool angwav;
+        bool featherwav;
         bool strengthw;
         bool sigmaed;
         bool radiusw;
@@ -962,6 +967,7 @@ public:
         bool baselog;
         bool strlog;
         bool anglog;
+        bool featherlog;
         bool CCmaskcurveL;
         bool LLmaskcurveL;
         bool HHmaskcurveL;
@@ -999,6 +1005,7 @@ public:
         bool shadmask;
         bool str_mask;
         bool ang_mask;
+        bool feather_mask;
         bool HHhmask_curve;
         bool Lmask_curve;
         bool LLmask_curvewav;
@@ -1129,6 +1136,7 @@ public:
         bool surroundcie;
         bool strgradcie;
         bool anggradcie;
+        bool feathercie;
 
         bool enacieMask;
         bool enacieMaskall;