merge with dev

2018-04-30 07:49:49 +02:00
parent ccf642bc6c 5d27eea860
commit 3ebbbdf139
56 changed files with 465 additions and 989 deletions
--- a/rtengine/procparams.h
+++ b/rtengine/procparams.h
@@ -740,7 +740,6 @@ struct FattalToneMappingParams {
  */
 struct SHParams {
    bool    enabled;
-    bool    hq;
    int     highlights;
    int     htonalwidth;
    int     shadows;