Try to solve conflit

2016-01-03 16:56:21 +01:00
parent 4e229fe928 4d6833c43c
commit edd88be82c
13 changed files with 67 additions and 46 deletions
--- a/rtengine/refreshmap.cc
+++ b/rtengine/refreshmap.cc
@@ -454,6 +454,8 @@ int refreshmap[rtengine::NUMOFEVENTS] = {
    DEMOSAIC,         // EvLbaselog
 //    DEMOSAIC,          // EvLgrbl
    DEMOSAIC,            // EvRetinexlhcurve
+    ALLNORAW,         // EvOIntent
+    MONITORTRANSFORM,  // EvMonitorTransform
    RETINEX,             // EvLiter
    RETINEX,             // EvLgrad
    RETINEX,             // EvLgrads
@@ -464,8 +466,6 @@ int refreshmap[rtengine::NUMOFEVENTS] = {
    RETINEX,            //EvLradius
    RETINEX,            //EvmapMethod
    DEMOSAIC,              //EvRetinexmapcurve
-    DEMOSAIC,              //EvviewMethod
-    ALLNORAW,         // EvOIntent
-    MONITORTRANSFORM  // EvMonitorTransform
+    DEMOSAIC              //EvviewMethod
 };