Merge branch 'dev' into newlocallab

2018-09-15 20:53:21 +02:00
parent 47f0564d25 e99bcff8bb
commit e9d4dede48
178 changed files with 4228 additions and 3683 deletions
--- a/rtengine/procparams.h
+++ b/rtengine/procparams.h
@@ -1509,6 +1509,8 @@ struct RAWParams {
    int ff_clipControl;

    bool ca_autocorrect;
+    bool ca_avoidcolourshift;
+    int caautoiterations;
    double cared;
    double cablue;