From a5d5e84249064f4966f8f712b18e2d63fa96691f Mon Sep 17 00:00:00 2001 From: daid Date: Thu, 6 Feb 2014 16:15:36 +0100 Subject: [PATCH] Fix silly Jaime mixing mouse buttons and moving objects bug. --- Cura/gui/sceneView.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Cura/gui/sceneView.py b/Cura/gui/sceneView.py index 0059ba30..0b1d7998 100644 --- a/Cura/gui/sceneView.py +++ b/Cura/gui/sceneView.py @@ -785,6 +785,9 @@ class SceneView(openglGui.glGuiPanel): if self._mouseState == 'tool': self.tool.OnDrag(p0, p1) elif not e.LeftIsDown() and e.RightIsDown(): + if self._mouseState == 'dragObject' and self._selectedObj is not None: + self._scene.pushFree(self._selectedObj) + self.sceneUpdated() self._mouseState = 'drag' if wx.GetKeyState(wx.WXK_SHIFT): a = math.cos(math.radians(self._yaw)) / 3.0 @@ -801,6 +804,9 @@ class SceneView(openglGui.glGuiPanel): if self._pitch < 10: self._pitch = 10 elif (e.LeftIsDown() and e.RightIsDown()) or e.MiddleIsDown(): + if self._mouseState == 'dragObject' and self._selectedObj is not None: + self._scene.pushFree(self._selectedObj) + self.sceneUpdated() self._mouseState = 'drag' self._zoom += e.GetY() - self._mouseY if self._zoom < 1: -- 2.30.2