merge with dev

2017-12-18 15:50:15 +01:00
parent 3c0d0ca9a0 d1d91869c8
commit 17239849c3
10 changed files with 65 additions and 25 deletions
--- a/rtengine/procevents.h
+++ b/rtengine/procevents.h
@@ -519,7 +519,7 @@ enum ProcEvent {
    EvTMFattalAmount = 489,
    EvWBEnabled = 490,
    EvRGBEnabled = 491,
-    EvlocallabEnabled = 492,
+    EvLEnabled = 492,
    EvlocallablocY = 493,
    EvlocallablocX = 494,
    EvlocallabCenter = 495,
@@ -623,6 +623,7 @@ enum ProcEvent {
    Evlocallabnoisechrodetail = 593,
    Evlocallabsensiden = 594,
    Evlocallabhuerefblur = 595,
+    EvlocallabEnabled = 596,

    NUMOFEVENTS