merge with dev

2019-11-14 10:52:16 +01:00
parent 29127f051f 3be7016517
commit 00c777a3f0
10 changed files with 102 additions and 52 deletions
--- a/rtgui/paramsedited.h
+++ b/rtgui/paramsedited.h
@@ -218,7 +218,7 @@ struct CaptureSharpeningParamsEdited {
    bool deconvradius;
    bool deconvradiusOffset;
    bool deconviter;
-    bool deconvrange;
+    bool deconvitercheck;
    bool isUnchanged() const;
 };