merge with dev

2020-03-24 17:34:09 +01:00
parent b1af4b8e4d 2bb747b55f
commit c405eab2c5
8 changed files with 115 additions and 5 deletions
--- a/rtgui/paramsedited.h
+++ b/rtgui/paramsedited.h
@@ -949,6 +949,7 @@ struct WaveletParamsEdited {
    bool ushamethod;
    bool avoid;
    bool showmask;
+    bool oldsh;
    bool tmr;
    bool c[9];
    bool ch[9];