merge with dev

2018-03-27 17:18:32 +02:00
parent 75fb5a697e c9fa7b055c
commit c74cdb922f
16 changed files with 275 additions and 29 deletions
--- a/rtgui/options.h
+++ b/rtgui/options.h
@@ -278,6 +278,7 @@ public:
    Glib::ustring clutsDir;
    int rgbDenoiseThreadLimit; // maximum number of threads for the denoising tool ; 0 = use the maximum available
    int maxInspectorBuffers;   // maximum number of buffers (i.e. images) for the Inspector feature
+    int inspectorDelay;
    int clutCacheSize;
    bool filledProfile;  // Used as reminder for the ProfilePanel "mode"
    prevdemo_t prevdemo; // Demosaicing method used for the <100% preview