merge with dev

2018-10-19 19:26:14 +02:00
parent bda6ad9235 72699902a3
commit e7448bd084
198 changed files with 2052 additions and 1128 deletions
--- a/rtengine/procparams.h
+++ b/rtengine/procparams.h
@@ -756,6 +756,7 @@ struct SHParams {
    int     shadows;
    int     stonalwidth;
    int     radius;
+    bool    lab;

    SHParams();