From: daid303 Date: Fri, 29 Mar 2013 08:59:07 +0000 (+0100) Subject: Have the shader editor refresh the load animation on change. X-Git-Tag: 13.05~146 X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=7281a1287c26c06b0d01de5253f419c17dad7a73;p=cura.git Have the shader editor refresh the load animation on change. --- diff --git a/Cura/gui/sceneView.py b/Cura/gui/sceneView.py index f90b7662..8b68b6db 100644 --- a/Cura/gui/sceneView.py +++ b/Cura/gui/sceneView.py @@ -146,6 +146,8 @@ class SceneView(openglGui.glGuiPanel): if s.isValid(): self._objectLoadShader.release() self._objectLoadShader = s + for obj in self._scene.objects(): + obj._loadAnim = anim(1, 0, 1.5) self.Refresh() def OnMouseDown(self,e): @@ -366,7 +368,7 @@ void main(void) if obj._loadAnim is None: continue self._objectLoadShader.setUniform('intensity', obj._loadAnim.getPosition()) - self._objectLoadShader.setUniform('scale', obj.getBoundaryCircle() / 20) + self._objectLoadShader.setUniform('scale', obj.getBoundaryCircle() / 10) self._renderObject(obj) self._objectLoadShader.unbind() glDisable(GL_BLEND)