Merge with branch 'dev/newlocallab'...

2019-01-25 12:58:28 +01:00
parent fc6e4ceaf1 1101484ecb
commit 8c90b560d7
50 changed files with 1667 additions and 1874 deletions
--- a/rtengine/procevents.h
+++ b/rtengine/procevents.h
@@ -638,8 +638,14 @@ enum ProcEventCode {
    EvlocallabCCmaskexpshape = 608,
    EvlocallabLLmaskexpshape = 609,
    EvlocallabHHmaskshape = 610,
-    EvLocallabEnaColorMask = 611,
-    EvLocallabEnaExpMask = 612,
+    Evlocallabstructcol = 611,
+    Evlocallabstructexp = 612,
+    EvlocallabHHmaskexpshape = 613,
+    Evlocallabblendmaskcol = 614,
+    Evlocallabblendmaskexp = 615,
+    Evlocallabblurexpde = 616,
+    EvLocallabEnaColorMask = 617,
+    EvLocallabEnaExpMask = 618,
    NUMOFEVENTS
 };