Merge branch 'master' into softproofing

2016-10-04 00:04:57 +02:00
parent ee4749f271 1c9b84aadb
commit 23011fbd63
71 changed files with 1083 additions and 822 deletions
--- a/rtengine/improccoordinator.cc
+++ b/rtengine/improccoordinator.cc
@@ -321,6 +321,7 @@ void ImProcCoordinator::updatePreviewImage (int todo, Crop* cropCall)
        ipf.setScale (scale);

        imgsrc->getImage (currWB, tr, orig_prev, pp, params.toneCurve, params.icm, params.raw);
+        denoiseInfoStore.valid = false;
        //ColorTemp::CAT02 (orig_prev, &params) ;
        //   printf("orig_prevW=%d\n  scale=%d",orig_prev->width, scale);
        /* Issue 2785, disabled some 1:1 tools