Merge from branch 'dev/newlocallab'...

2018-10-08 20:56:29 +02:00
parent 854021cfee 23bcf63e2c
commit 88c5214a47
156 changed files with 1988 additions and 2057 deletions
--- a/rtengine/dcrop.cc
+++ b/rtengine/dcrop.cc
@@ -1046,9 +1046,7 @@ void Crop::update(int todo)

        if (params.wavelet.Tilesmethod == "big") {
            realtile = 22;
-        }
-
-        if (params.wavelet.Tilesmethod == "lit") {
+        } else /*if (params.wavelet.Tilesmethod == "lit")*/ {
            realtile = 12;
        }