Merge branch 'dev' into idle_harder

2017-03-30 21:44:31 +02:00
parent 6e1f7df2fb f0b7547cbb
commit f114b1151f
39 changed files with 1796 additions and 1425 deletions
--- a/rtgui/retinex.cc
+++ b/rtgui/retinex.cc
@@ -8,7 +8,7 @@
 using namespace rtengine;
 using namespace rtengine::procparams;

-Retinex::Retinex () : FoldableToolPanel(this, "retinex", M("TP_RETINEX_LABEL"), false, true)
+Retinex::Retinex () : FoldableToolPanel(this, "retinex", M("TP_RETINEX_LABEL"), false, true), lastmedianmap(false)
 {
    CurveListener::setMulti(true);
    std::vector<double> defaultCurve;