merge with dev

2018-10-07 09:58:43 +02:00
parent e9d4dede48 c34bd31765
commit 72ed6f81b0
156 changed files with 1988 additions and 2059 deletions
--- a/rtengine/dcrop.cc
+++ b/rtengine/dcrop.cc
@@ -1887,9 +1887,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;
        }