From 66740ee59c6a2447268484b77ccc796d42d22d28 Mon Sep 17 00:00:00 2001 From: daid Date: Thu, 6 Feb 2014 16:17:03 +0100 Subject: [PATCH] Fix silly Jaime mixing mouse buttons and moving objects bug. --- Cura/gui/sceneView.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/Cura/gui/sceneView.py b/Cura/gui/sceneView.py index 18ca93a8..605cf258 100644 --- a/Cura/gui/sceneView.py +++ b/Cura/gui/sceneView.py @@ -731,6 +731,9 @@ class SceneView(openglGui.glGuiPanel): if e.ButtonDClick(): self._mouseState = 'doubleClick' else: + if self._mouseState == 'dragObject' and self._selectedObj is not None: + self._scene.pushFree(self._selectedObj) + self.sceneUpdated() self._mouseState = 'dragOrClick' p0, p1 = self.getMouseRay(self._mouseX, self._mouseY) p0 -= self.getObjectCenterPos() - self._viewTarget @@ -785,9 +788,6 @@ 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 @@ -804,9 +804,6 @@ 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