Merge branch 'master' into softproofing

2016-08-27 23:52:53 +02:00
parent f11ef69cda d9d539cbb3
commit a1981dbd4d
12 changed files with 1584 additions and 1312 deletions
--- a/rtengine/improccoordinator.h
+++ b/rtengine/improccoordinator.h
@@ -198,6 +198,8 @@ protected:
    bool wavcontlutili;
    void startProcessing ();
    void process ();
+    float colourToningSatLimit;
+    float colourToningSatLimitOpacity;

 public: