diff options
| author | Ghostkeeper <rubend@tutanota.com> | 2020-08-20 17:35:52 +0300 |
|---|---|---|
| committer | Ghostkeeper <rubend@tutanota.com> | 2020-08-20 17:35:52 +0300 |
| commit | 9ea418c0a1bcb5645a61b9534c61381e8c618e3a (patch) | |
| tree | 2c495ae5acb4f1680944434905a86c6917e46e93 /cura/PreviewPass.py | |
| parent | a757dc7fa0b1b19efa1024132e2d6c94d2788626 (diff) | |
Revert "Revert "Merge branch '4.7' of github.com:Ultimaker/Cura into 4.7""
This reverts commit 28f4d8513db7efce17bfd8b80fa7c8b237fd1c18.
The original revert was to revert an accidental merge from master to 4.7. This now reverts the revert on Master, so that we still have those changes on Master.
Diffstat (limited to 'cura/PreviewPass.py')
| -rw-r--r-- | cura/PreviewPass.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cura/PreviewPass.py b/cura/PreviewPass.py index ba139bb2b3..47e8c367dc 100644 --- a/cura/PreviewPass.py +++ b/cura/PreviewPass.py @@ -76,8 +76,8 @@ class PreviewPass(RenderPass): Logger.error("Unable to compile shader program: overhang.shader") if not self._non_printing_shader: + self._non_printing_shader = OpenGL.getInstance().createShaderProgram(Resources.getPath(Resources.Shaders, "transparent_object.shader")) if self._non_printing_shader: - self._non_printing_shader = OpenGL.getInstance().createShaderProgram(Resources.getPath(Resources.Shaders, "transparent_object.shader")) self._non_printing_shader.setUniformValue("u_diffuseColor", [0.5, 0.5, 0.5, 0.5]) self._non_printing_shader.setUniformValue("u_opacity", 0.6) |