Change GUI merge file from settings to Color and light

2019-11-10 13:53:12 +01:00
parent e79bb87c91
commit 7f7137c5ab
12 changed files with 795 additions and 580 deletions
--- a/rtgui/paramsedited.h
+++ b/rtgui/paramsedited.h
@@ -384,7 +384,7 @@ public:
        bool isvisible;
        bool shape;
        bool spotMethod;
-        bool mergeMethod;
+//        bool mergeMethod;
        bool sensiexclu;
        bool structexclu;
        bool struc;
@@ -434,6 +434,7 @@ public:
        bool lapmaskcol;
        bool qualitycurveMethod;
        bool gridMethod;
+        bool merMethod;
        bool toneMethod;
        bool mergecolMethod;
        bool llcurve;