merge with dev

2018-08-22 18:21:40 +02:00
parent 5472673b9e 3e7f19c81b
commit 47f0564d25
140 changed files with 3185 additions and 1208 deletions
--- a/rtengine/improccoordinator.cc
+++ b/rtengine/improccoordinator.cc
@@ -639,7 +639,7 @@ void ImProcCoordinator::updatePreviewImage(int todo, Crop* cropCall)

    progress("Exposure curve & CIELAB conversion...", 100 * readyphase / numofphases);

-    if (todo &  M_AUTOEXP) {
+    if (todo &  (M_AUTOEXP | M_RGBCURVE)) {
        if (params.icm.workingTRC == "Custom") { //exec TRC IN free
            Glib::ustring profile;
            profile = params.icm.workingProfile;