Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/Ultimaker/Cura.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGhostkeeper <rubend@tutanota.com>2020-03-25 17:13:33 +0300
committerGhostkeeper <rubend@tutanota.com>2020-03-25 17:13:33 +0300
commita4fbf3c613bfe8f91b1bb63b472e2f9ff22b69bb (patch)
tree2efa384a98231ffd3b2530fb552662db5a23c284 /plugins/SolidView
parent0150f37937bc6395de5dd515e655483fadae50b6 (diff)
Move X-ray set-up code into _checkSetup
That's what that function is meant for. It's executing essentially the same, since before it was executed right after the call to _checkSetup() and now it's at the end inside that function. Contributes to issue CURA-7262.
Diffstat (limited to 'plugins/SolidView')
-rw-r--r--plugins/SolidView/SolidView.py12
1 files changed, 6 insertions, 6 deletions
diff --git a/plugins/SolidView/SolidView.py b/plugins/SolidView/SolidView.py
index f0d1d75690..65ae03d140 100644
--- a/plugins/SolidView/SolidView.py
+++ b/plugins/SolidView/SolidView.py
@@ -133,12 +133,6 @@ class SolidView(View):
self._support_mesh_shader.setUniformValue("u_vertical_stripes", True)
self._support_mesh_shader.setUniformValue("u_width", 5.0)
- def beginRendering(self):
- scene = self.getController().getScene()
- renderer = self.getRenderer()
-
- self._checkSetup()
-
if not CuraApplication.getInstance().getPreferences().getValue(self._show_xray_warning_preference):
self._xray_error_image = None
self._xray_shader = None
@@ -183,6 +177,12 @@ class SolidView(View):
self._old_composite_shader = self._composite_pass.getCompositeShader()
self._composite_pass.setCompositeShader(self._xray_composite_shader)
+ def beginRendering(self):
+ scene = self.getController().getScene()
+ renderer = self.getRenderer()
+
+ self._checkSetup()
+
global_container_stack = Application.getInstance().getGlobalContainerStack()
if global_container_stack:
if Application.getInstance().getPreferences().getValue("view/show_overhang"):