Merge branch 'dev' into spot-removal-tool

2020-11-24 17:16:41 +01:00
parent f42548b018 0367d31403
commit 19e3833e66
257 changed files with 79066 additions and 10075 deletions
--- a/rtgui/editcallbacks.cc
+++ b/rtgui/editcallbacks.cc
@@ -99,10 +99,11 @@ bool EditSubscriber::isPicking() const

 EditDataProvider::EditDataProvider() :
    currSubscriber(nullptr),
-    object(0),
+//    object(0),
    pipetteVal1(0.f),
    pipetteVal2(0.f),
    pipetteVal3(0.f),
+    object(0),
    posScreen(-1, -1),
    posImage(-1, -1),
    deltaScreen(0, 0),