From 70745487f388851ac41204d81f5238e54979bfa2 Mon Sep 17 00:00:00 2001
From: Marc Zinnschlag <marc@zpages.de>
Date: Sat, 5 Mar 2016 10:44:46 +0100
Subject: [PATCH] cancel instance move on editing lock becoming active

---
 apps/opencs/view/render/instancemode.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/apps/opencs/view/render/instancemode.cpp b/apps/opencs/view/render/instancemode.cpp
index 74df6740e..0c4da4963 100644
--- a/apps/opencs/view/render/instancemode.cpp
+++ b/apps/opencs/view/render/instancemode.cpp
@@ -96,6 +96,11 @@ void CSVRender::InstanceMode::setEditLock (bool locked)
 {
     mLocked = locked;
 
+    if (mLocked)
+    {
+        mDragMode = DragMode_None;
+        getWorldspaceWidget().reset (Mask_Reference);
+    }
 }
 
 void CSVRender::InstanceMode::primaryEditPressed (osg::ref_ptr<TagBase> tag)