merge with dev

2019-09-13 08:57:10 +02:00
parent a22624e8f9 4efc3b8842
commit eea35577d7
21 changed files with 418 additions and 45 deletions
--- a/rtengine/refreshmap.cc
+++ b/rtengine/refreshmap.cc
@@ -521,7 +521,7 @@ int refreshmap[rtengine::NUMOFEVENTS] = {
    RGBCURVE,         // EvRGBEnabled
    LUMINANCECURVE,   // EvLEnabled
    DEMOSAIC,         // EvPdShrEnabled
-    ALLNORAW,          // EvPdShrMaskToggled
+    CAPTURESHARPEN,    // EvPdShrMaskToggled
    LUMINANCECURVE,   // EvLocallabSpotDeleted
    LUMINANCECURVE,   // EvLocallabSpotSelected
    M_VOID,           // EvLocallabSpotName