Merge branch 'dev' into newlocallab

2019-08-08 16:18:58 +02:00
parent 3603cad472 82e329ca83
commit b3e0013e56
96 changed files with 1000 additions and 1654 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;