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/refreshmap.cc
+++ b/rtengine/refreshmap.cc
@@ -516,7 +516,9 @@ int refreshmap[rtengine::NUMOFEVENTS] = {
    DARKFRAME,        // EvLensCorrLensfunLens
    ALLNORAW,         // EvTMFattalEnabled
    HDR,              // EvTMFattalThreshold
-    HDR,               // EvTMFattalAmount
+    HDR,              // EvTMFattalAmount
+    ALLNORAW,         // EvWBEnabled
+    RGBCURVE,          // EvRGBEnabled
    LUMINANCECURVE,   // EvlocallabEnabled
    LUMINANCECURVE,   // EvlocallablocY
    LUMINANCECURVE,   // EvlocallablocX
@@ -617,6 +619,5 @@ int refreshmap[rtengine::NUMOFEVENTS] = {
    LUMINANCECURVE,   // Evlocallabsensiexclu
    LUMINANCECURVE,   // Evlocallabstruc
    LUMINANCECURVE   // Evlocallabwarm
-
 };