From: nallath Date: Thu, 6 Feb 2014 15:08:25 +0000 (+0100) Subject: And even more comments X-Git-Tag: 14.02-RC1~23^2 X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=aa29f8a1149eaa39dcd86a39923cd18a8b741878;p=cura.git And even more comments --- diff --git a/Cura/gui/sceneView.py b/Cura/gui/sceneView.py index 0059ba30..be9bf375 100644 --- a/Cura/gui/sceneView.py +++ b/Cura/gui/sceneView.py @@ -898,7 +898,7 @@ class SceneView(openglGui.glGuiPanel): self._zoom = self._animZoom.getPosition() if self._animZoom.isDone(): self._animZoom = None - if self._objectShader is None: + if self._objectShader is None: #TODO: add loading shaders from file(s) if openglHelpers.hasShaderSupport(): self._objectShader = openglHelpers.GLShader(""" varying float light_amount; @@ -974,7 +974,7 @@ class SceneView(openglGui.glGuiPanel): gl_FragColor = vec4(gl_Color.xyz * light_amount, 1.0-intensity); } """) - if self._objectShader is None or not self._objectShader.isValid(): + if self._objectShader is None or not self._objectShader.isValid(): #Could not make shader. self._objectShader = openglHelpers.GLFakeShader() self._objectOverhangShader = openglHelpers.GLFakeShader() self._objectLoadShader = None @@ -997,7 +997,7 @@ class SceneView(openglGui.glGuiPanel): glColor4ub((n >> 16) & 0xFF, (n >> 8) & 0xFF, (n >> 0) & 0xFF, 0xFF) self._renderObject(obj) - if self._mouseX > -1: + if self._mouseX > -1: # mouse has not passed over the opengl window. glFlush() n = glReadPixels(self._mouseX, self.GetSize().GetHeight() - 1 - self._mouseY, 1, 1, GL_RGBA, GL_UNSIGNED_INT_8_8_8_8)[0][0] >> 8 if n < len(self._scene.objects()):