mirror of
https://github.com/Ultimaker/Cura.git
synced 2025-07-10 00:07:51 -06:00
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.
This commit is contained in:
parent
0150f37937
commit
a4fbf3c613
1 changed files with 6 additions and 6 deletions
|
@ -133,12 +133,6 @@ class SolidView(View):
|
||||||
self._support_mesh_shader.setUniformValue("u_vertical_stripes", True)
|
self._support_mesh_shader.setUniformValue("u_vertical_stripes", True)
|
||||||
self._support_mesh_shader.setUniformValue("u_width", 5.0)
|
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):
|
if not CuraApplication.getInstance().getPreferences().getValue(self._show_xray_warning_preference):
|
||||||
self._xray_error_image = None
|
self._xray_error_image = None
|
||||||
self._xray_shader = None
|
self._xray_shader = None
|
||||||
|
@ -183,6 +177,12 @@ class SolidView(View):
|
||||||
self._old_composite_shader = self._composite_pass.getCompositeShader()
|
self._old_composite_shader = self._composite_pass.getCompositeShader()
|
||||||
self._composite_pass.setCompositeShader(self._xray_composite_shader)
|
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()
|
global_container_stack = Application.getInstance().getGlobalContainerStack()
|
||||||
if global_container_stack:
|
if global_container_stack:
|
||||||
if Application.getInstance().getPreferences().getValue("view/show_overhang"):
|
if Application.getInstance().getPreferences().getValue("view/show_overhang"):
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue