Merge branch 'dev' into wavelenh

2019-09-25 12:43:57 +02:00
parent f57d74ffbd b86b7a4af6
commit fa7ba481d7
18 changed files with 693 additions and 385 deletions
--- a/rtengine/procparams.h
+++ b/rtengine/procparams.h
@@ -1353,6 +1353,7 @@ struct DehazeParams {
    int strength;
    bool showDepthMap;
    int depth;
+    bool luminance;

    DehazeParams();