Add background to merge file

2019-11-18 18:05:29 +01:00
parent a7cc1d2feb
commit bb9673db68
10 changed files with 257 additions and 17 deletions
--- a/rtengine/procparams.h
+++ b/rtengine/procparams.h
@@ -998,6 +998,10 @@ struct LocallabParams {
        double labgridBLow;
        double labgridAHigh;
        double labgridBHigh;
+        double labgridALowmerg;
+        double labgridBLowmerg;
+        double labgridAHighmerg;
+        double labgridBHighmerg;
        int strengthgrid;
        int sensi;
        int structcol;
@@ -1030,6 +1034,8 @@ struct LocallabParams {
        std::vector<double> HHhmaskcurve;
        double softradiuscol;
        double opacol;
+        double mercol;
+        double merlucol;
        double conthrcol;
        std::vector<double> Lmaskcurve;
        std::vector<double> LLmaskcolcurvewav;