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/rtengine/procparams.h
+++ b/rtengine/procparams.h
@@ -961,7 +961,7 @@ struct LocallabParams {
        bool isvisible;
        Glib::ustring shape; // ELI, RECT
        Glib::ustring spotMethod; // norm, exc
-        Glib::ustring mergeMethod; // none, short, orig
+//        Glib::ustring mergeMethod; // none, short, orig
        int sensiexclu;
        int structexclu;
        double struc;
@@ -1011,6 +1011,7 @@ struct LocallabParams {
        double lapmaskcol;
        Glib::ustring qualitycurveMethod;
        Glib::ustring gridMethod;
+        Glib::ustring merMethod;
        Glib::ustring toneMethod;
        Glib::ustring mergecolMethod;
        std::vector<double> llcurve;