From d33c98c68d6b56ac4377d64b90140c1954b2f0b3 Mon Sep 17 00:00:00 2001
From: Nelsson Huotari <unelsson@gmail.com>
Date: Sun, 6 May 2018 18:13:15 +0300
Subject: [PATCH] Revert unintended changes

---
 apps/opencs/view/render/worldspacewidget.cpp | 1 +
 apps/opencs/view/widget/scenetoolmode.cpp    | 9 ---------
 apps/opencs/view/widget/scenetoolmode.hpp    | 2 --
 3 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/apps/opencs/view/render/worldspacewidget.cpp b/apps/opencs/view/render/worldspacewidget.cpp
index 9fb6aa02a..c2a6617c1 100644
--- a/apps/opencs/view/render/worldspacewidget.cpp
+++ b/apps/opencs/view/render/worldspacewidget.cpp
@@ -576,6 +576,7 @@ void CSVRender::WorldspaceWidget::debugProfileAboutToBeRemoved (const QModelInde
 
 void CSVRender::WorldspaceWidget::editModeChanged (const std::string& id)
 {
+    dynamic_cast<CSVRender::EditMode&> (*mEditMode->getCurrent()).setEditLock (mLocked);
     mDragging = false;
     mDragMode = InteractionType_None;
 }
diff --git a/apps/opencs/view/widget/scenetoolmode.cpp b/apps/opencs/view/widget/scenetoolmode.cpp
index 426bceb29..7b2ff64db 100644
--- a/apps/opencs/view/widget/scenetoolmode.cpp
+++ b/apps/opencs/view/widget/scenetoolmode.cpp
@@ -134,15 +134,6 @@ void CSVWidget::SceneToolMode::setButton (const std::string& id)
         }
 }
 
-
-void CSVWidget::SceneToolMode::mouseReleaseEvent (QMouseEvent *event)
-{
-    if (getType()==Type_TopAction && event->button()==Qt::RightButton)
-        showPanel (parentWidget()->mapToGlobal (pos()));
-    else
-        PushButton::mouseReleaseEvent (event);
-}
-
 bool CSVWidget::SceneToolMode::event(QEvent* event)
 {
     if (event->type() == QEvent::ToolTip)
diff --git a/apps/opencs/view/widget/scenetoolmode.hpp b/apps/opencs/view/widget/scenetoolmode.hpp
index 377357df6..90f1dc419 100644
--- a/apps/opencs/view/widget/scenetoolmode.hpp
+++ b/apps/opencs/view/widget/scenetoolmode.hpp
@@ -44,8 +44,6 @@ namespace CSVWidget
 
             void setButton (std::map<ModeButton *, std::string>::iterator iter);
 
-            void mouseReleaseEvent (QMouseEvent *event);
-
         protected:
 
             bool event(QEvent* event);