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/improccoordinator.h
+++ b/rtengine/improccoordinator.h
@@ -203,7 +203,8 @@ protected:
    void reallocAll();
    void updateLRGBHistograms();
    void setScale(int prevscale);
-    void updatePreviewImage(int todo, Crop* cropCall = nullptr);
+    void updatePreviewImage (int todo, bool panningRelatedChange);
+//    void updatePreviewImage(int todo, Crop* cropCall = nullptr);

    MyMutex mProcessing;
    ProcParams params;