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/rtengine/procparams.h
+++ b/rtengine/procparams.h
@@ -1679,6 +1679,7 @@ struct WaveletParams {
    bool lipst;
    bool avoid;
    bool showmask;
+    bool oldsh;
    bool tmr;
    int strength;
    int balance;