Fix silly Jaime mixing mouse buttons and moving objects bug.

diff --git a/Cura/gui/sceneView.py b/Cura/gui/sceneView.py
index 18ca93a8fd2568ada6179fbf452a65fc7abc8c6c..605cf2589b69986ae054c55a11e541d1eac2fd88 100644 (file)
--- 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: