Merge branch 'master' into retinex

2015-09-27 21:18:17 +02:00
parent e234bb9278 e525fbb353
commit 6c49279ab9
12 changed files with 458 additions and 465 deletions
--- a/rtgui/editorpanel.cc
+++ b/rtgui/editorpanel.cc
@@ -567,6 +567,7 @@ void EditorPanel::open (Thumbnail* tmb, rtengine::InitialImage* isrc)
        Gtk::Allocation alloc;
        iareapanel->imageArea->on_resized(alloc);
    }
+    history->resetSnapShotNumber();
 }

 void EditorPanel::close ()