merge with dev

2019-08-17 17:49:36 +02:00
parent 981e2783bb f7ec852e05
commit a751857b5c
130 changed files with 1149 additions and 1777 deletions
--- a/rtgui/whitebalance.cc
+++ b/rtgui/whitebalance.cc
@@ -395,7 +395,6 @@ void WhiteBalance::adjusterChanged(Adjuster* a, double newval)
        return;
    }

-    Glib::ustring colLabel = row[methodColumns.colLabel];
    const std::pair<bool, const WBEntry&> ppMethod = findWBEntry (row[methodColumns.colLabel], WBLT_GUI);
    const std::pair<bool, const WBEntry&> wbCustom = findWBEntry ("Custom", WBLT_PP);