merge with dev

2020-04-05 15:51:12 +02:00
parent fb23a3c8ef 15db8cdb57
commit 753cf61ae6
11 changed files with 626 additions and 224 deletions
--- a/rtengine/procparams.h
+++ b/rtengine/procparams.h
@@ -1673,6 +1673,9 @@ struct WaveletParams {
    int bluemed;
    int greenhigh;
    int bluehigh;
+    double balchrom;
+    double chromfi;
+    double chromco;
    double mergeL;
    double mergeC;
    double softrad;