merge with dev

2017-12-13 08:42:13 +01:00
parent 3b54fa6dc3 48cc4511cc
commit caafa4729a
53 changed files with 645 additions and 375 deletions
--- a/rtengine/simpleprocess.cc
+++ b/rtengine/simpleprocess.cc
@@ -230,8 +230,10 @@ private:
        // set the color temperature
        currWB = ColorTemp(params.wb.temperature, params.wb.green, params.wb.equal, params.wb.method);

-        if (params.wb.method == "Camera") {
-            currWB = imgsrc->getWB();
+        if (!params.wb.enabled) {
+            currWB = ColorTemp();
+        } else if (params.wb.method == "Camera") {
+            currWB = imgsrc->getWB ();
        } else if (params.wb.method == "Auto") {
            double rm, gm, bm;
            imgsrc->getAutoWBMultipliers(rm, gm, bm);