Merge branch 'dev' into spot-removal-tool

2019-08-16 22:58:17 +02:00
parent 0d19cd40a6 f7ec852e05
commit 883e73454d
118 changed files with 1110 additions and 1747 deletions
--- a/rtgui/toolpanelcoord.h
+++ b/rtgui/toolpanelcoord.h
@@ -84,6 +84,7 @@
 #include "dehaze.h"
 #include "guiutils.h"
 #include "filmnegative.h"
+#include "../rtengine/noncopyable.h"

 class ImageEditorCoordinator;

@@ -100,7 +101,8 @@ class ToolPanelCoordinator :
    public ICMPanelListener,
    public ImageAreaToolListener,
    public rtengine::ImageTypeListener,
-    public FilmNegProvider
+    public FilmNegProvider,
+    public rtengine::NonCopyable
 {
 protected:
    WhiteBalance* whitebalance;