merge with dev

2017-12-23 10:18:46 +01:00
parent 9713604b12 156cb762ec
commit c1ab9788a5
10 changed files with 73 additions and 98 deletions
--- a/rtengine/procparams.h
+++ b/rtengine/procparams.h
@@ -743,7 +743,6 @@ struct SHParams {
    int     htonalwidth;
    int     shadows;
    int     stonalwidth;
-    int     localcontrast;
    int     radius;

    SHParams();