Merge branch 'master' into gtk3

2016-08-24 21:38:27 +02:00
parent a3673d26a4 d9d539cbb3
commit a6179ef969
12 changed files with 1584 additions and 1316 deletions
--- a/rtgui/batchtoolpanelcoord.cc
+++ b/rtgui/batchtoolpanelcoord.cc
@@ -247,6 +247,10 @@ void BatchToolPanelCoordinator::initSession ()
                pparams.toneCurve.contrast = 0;
            }

+            if (options.baBehav[ADDSET_TC_SATURATION]) {
+                pparams.toneCurve.saturation = 0;
+            }
+
            if (options.baBehav[ADDSET_SH_HIGHLIGHTS]) {
                pparams.sh.highlights = 0;
            }