merge with dev

2018-11-01 17:34:21 +01:00
parent b9c7fa80da 5e30b5ac58
commit 19d71e46d4
19 changed files with 955 additions and 92 deletions
--- a/rtgui/paramsedited.h
+++ b/rtgui/paramsedited.h
@@ -178,6 +178,8 @@ public:
    bool labgridBLow;
    bool labgridAHigh;
    bool labgridBHigh;
+    bool labregions;
+    bool labregionsShowMask;
 };

 class SharpenEdgeParamsEdited