Fixing #328

diff --git a/Cura/gui/preview3d.py b/Cura/gui/preview3d.py
index eeea98db0f0dc244fab879c4f6e37052a95f6bbf..db5e484514b58db246640f090511e67cf0d7a53f 100644 (file)
--- a/Cura/gui/preview3d.py
+++ b/Cura/gui/preview3d.py
@@ -261,6 +261,27 @@ class toolRotate(object):
                        glVertex3f(math.cos(i/32.0*math.pi), 0, math.sin(i/32.0*math.pi))
                glEnd()
 
+class toolScale(object):
+       def __init__(self, parent):
+               self.parent = parent
+
+       def OnMouseMove(self, p0, p1):
+               pass
+
+       def OnDragStart(self, p0, p1):
+               pass
+
+       def OnDrag(self, p0, p1):
+               pass
+
+       def OnDragEnd(self):
+               pass
+
+       def OnDraw(self):
+               glDisable(GL_LIGHTING)
+               size = self.parent.getObjectSize() / 2
+               opengl.DrawBox(-size, size)
+
 class previewPanel(wx.Panel):
        def __init__(self, parent):
                super(previewPanel, self).__init__(parent,-1)
@@ -376,6 +397,8 @@ class previewPanel(wx.Panel):
                        self.tool = toolInfo(self.glCanvas)
                if self.rotateToolButton.GetValue():
                        self.tool = toolRotate(self.glCanvas)
+               if self.scaleToolButton.GetValue():
+                       self.tool = toolScale(self.glCanvas)
                self.returnToModelViewAndUpdateModel()
 
        def OnMirrorX(self, e):

diff --git a/Cura/gui/util/opengl.py b/Cura/gui/util/opengl.py
index 42d9da5e5f7b293fa9b8a90a9747962af0214a30..29b487e0a6d19d2fe33219ff1d75e14371fad803 100644 (file)
--- a/Cura/gui/util/opengl.py
+++ b/Cura/gui/util/opengl.py
@@ -15,6 +15,7 @@ try:
        from OpenGL.GLUT import *
        from OpenGL.GLU import *
        from OpenGL.GL import *
+       glutInit()
 
        hasOpenGLlibs = True
 except: