merge with dev

2018-12-30 13:57:40 +01:00
parent d54198cc56 b968f956da
commit cc6cf81c57
11 changed files with 126 additions and 28 deletions
--- a/rtengine/procparams.h
+++ b/rtengine/procparams.h
@@ -498,6 +498,7 @@ struct ColorToningParams {
 struct SharpeningParams {
    bool           enabled;
    double         contrast;
+    double         blurradius;
    double         radius;
    int            amount;
    Threshold<int> threshold;