merged 'dev' into 'sony-pixel-shift'

2017-12-18 10:11:38 +01:00
parent 7d430adbc6 d1d91869c8
commit 14a30c6c39
64 changed files with 1000 additions and 751 deletions
--- a/rtengine/procevents.h
+++ b/rtengine/procevents.h
@@ -511,15 +511,16 @@ enum ProcEvent {
    EvCATgreensc = 481,
    EvCATybscen = 482,
    EvCATAutoyb = 483,
-    // profiled lens correction new events
    EvLensCorrMode = 484,
    EvLensCorrLensfunCamera = 485,
    EvLensCorrLensfunLens = 486,
-    // Fattal tone mapping
    EvTMFattalEnabled = 487,
    EvTMFattalThreshold = 488,
    EvTMFattalAmount = 489,
-    EvPixelShiftOneGreen = 490,
+    EvWBEnabled = 490,
+    EvRGBEnabled = 491,
+    EvLEnabled = 492,
+    EvPixelShiftOneGreen = 493,

    NUMOFEVENTS