From: daid <daid303@gmail.com>
Date: Thu, 6 Feb 2014 15:15:36 +0000 (+0100)
Subject: Fix silly Jaime mixing mouse buttons and moving objects bug.
X-Git-Tag: 14.02-RC1~24
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=a5d5e84249064f4966f8f712b18e2d63fa96691f;p=cura.git

Fix silly Jaime mixing mouse buttons and moving objects bug.
---

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: