Merge branch 'master' into spot-removal-tool

2016-12-28 01:57:46 +01:00
parent 6b22cbd831 cc8dae26ff
commit 3eeeb151ec
383 changed files with 30405 additions and 10838 deletions
--- a/rtengine/procevents.h
+++ b/rtengine/procevents.h
@@ -469,7 +469,8 @@ enum ProcEvent {
    EvcbdlMethod = 439,
    EvRetinexgaintransmission = 440,
    EvLskal = 441,
-    EvSpotEnabled = 442,
+    EvOBPCompens = 442,
+    EvSpotEnabled = 443,
    NUMOFEVENTS

 };