merge with dev

2017-06-27 10:28:35 +02:00
parent acd715dd44 0ecb02afdd
commit dfffa2e8aa
45 changed files with 1074 additions and 400 deletions
--- a/rtengine/procevents.h
+++ b/rtengine/procevents.h
@@ -73,7 +73,7 @@ enum ProcEvent {
    EvLDNRadius = 43, // obsolete
    EvLDNEdgeTolerance = 44, // obsolete
    EvCDNEnabled = 45, // obsolete
-    EvBlendCMSMatrix = 46,
+    EvBlendCMSMatrix = 46, // obsolete
    EvDCPToneCurve = 47,
    EvDCPIlluminant = 48,
    EvSHEnabled = 49,