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/rtgui/paramsedited.h
+++ b/rtgui/paramsedited.h
@@ -1027,6 +1027,9 @@ struct WaveletParamsEdited {
    bool bluemed;
    bool greenhigh;
    bool bluehigh;
+    bool balchrom;
+    bool chromfi;
+    bool chromco;
    bool mergeL;
    bool mergeC;
    bool softrad;