merge with dev - I hope no error

2017-02-21 18:02:48 +01:00
parent f9b592dfd5 ac882d2ff2
commit 1f7ad78e25
74 changed files with 886 additions and 695 deletions
--- a/rtgui/options.cc
+++ b/rtgui/options.cc
@@ -624,7 +624,7 @@ void Options::setDefaults ()
        0,  // ADDSET_LOCALLAB_TRANSIT
        0,  // ADDSET_LOCALLAB_STRENGTH
        0,  // ADDSET_LOCALLAB_SENSI
-
+        0, // ADDSET_WB_TEMPBIAS
    };

    rtSettings.darkFramesPath = "";