3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-06 22:47:29 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix disabling show_xray_warning

Browse source
This commit is contained in:
Jaime van Kessel 2020-06-29 13:30:19 +02:00
parent c6fd25e7e9
commit d2280b9afb
No known key found for this signature in database
GPG key ID: 3710727397403C91
2 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
plugins/SolidView/SolidView.py
View file

@ -117,6 +117,7 @@ class SolidView(View):
if not self._enabled_shader: if not self._enabled_shader:
self._enabled_shader = OpenGL.getInstance().createShaderProgram(Resources.getPath(Resources.Shaders, "overhang.shader")) self._enabled_shader = OpenGL.getInstance().createShaderProgram(Resources.getPath(Resources.Shaders, "overhang.shader"))
self._enabled_shader.setUniformValue("u_overhangColor", Color(*self._theme.getColor("model_overhang").getRgb())) self._enabled_shader.setUniformValue("u_overhangColor", Color(*self._theme.getColor("model_overhang").getRgb()))
self._enabled_shader.setUniformValue("u_renderError", 0.0)
if not self._disabled_shader: if not self._disabled_shader:
self._disabled_shader = OpenGL.getInstance().createShaderProgram(Resources.getPath(Resources.Shaders, "striped.shader")) self._disabled_shader = OpenGL.getInstance().createShaderProgram(Resources.getPath(Resources.Shaders, "striped.shader"))
@ -142,6 +143,7 @@ class SolidView(View):
self._composite_pass.setCompositeShader(self._old_composite_shader) self._composite_pass.setCompositeShader(self._old_composite_shader)
self._old_layer_bindings = None self._old_layer_bindings = None
self._old_composite_shader = None self._old_composite_shader = None
self._enabled_shader.setUniformValue("u_renderError", 0.0) # We don't want any error markers!.
self._xray_warning_message.hide() self._xray_warning_message.hide()
else: else:
if not self._xray_shader: if not self._xray_shader:
@ -159,7 +161,7 @@ class SolidView(View):
# Currently the RenderPass constructor requires a size > 0 # Currently the RenderPass constructor requires a size > 0
# This should be fixed in RenderPass's constructor. # This should be fixed in RenderPass's constructor.
self._xray_pass = XRayPass.XRayPass(1, 1) self._xray_pass = XRayPass.XRayPass(1, 1)
self._enabled_shader.setUniformValue("u_renderError", 1.0) # We don't want any error markers!.
renderer.addRenderPass(self._xray_pass) renderer.addRenderPass(self._xray_pass)
if not self._composite_pass: if not self._composite_pass:

4
resources/qml/Preferences/GeneralPage.qml
View file

@ -90,7 +90,7 @@ UM.PreferencesPage
UM.Preferences.resetPreference("view/show_overhang"); UM.Preferences.resetPreference("view/show_overhang");
showOverhangCheckbox.checked = boolCheck(UM.Preferences.getValue("view/show_overhang")) showOverhangCheckbox.checked = boolCheck(UM.Preferences.getValue("view/show_overhang"))
UM.Preferences.resetPreference("view/show_xray_warning"); UM.Preferences.resetPreference("view/show_xray_warning");
showXrayErrorCheckbox.checked = boolCheck(UM.Preferences.getValue("view/show_warning")) showXrayErrorCheckbox.checked = boolCheck(UM.Preferences.getValue("view/show_xray_warning"))
UM.Preferences.resetPreference("view/center_on_select"); UM.Preferences.resetPreference("view/center_on_select");
centerOnSelectCheckbox.checked = boolCheck(UM.Preferences.getValue("view/center_on_select")) centerOnSelectCheckbox.checked = boolCheck(UM.Preferences.getValue("view/center_on_select"))
UM.Preferences.resetPreference("view/invert_zoom"); UM.Preferences.resetPreference("view/invert_zoom");
@ -336,7 +336,7 @@ UM.PreferencesPage
id: showOverhangCheckbox id: showOverhangCheckbox
checked: boolCheck(UM.Preferences.getValue("view/show_overhang")) checked: boolCheck(UM.Preferences.getValue("view/show_overhang"))
onClicked: UM.Preferences.setValue("view/show_overhang", checked) onClicked: UM.Preferences.setValue("view/show_overhang", checked)
text: catalog.i18nc("@option:check", "Display overhang"); text: catalog.i18nc("@option:check", "Display overhang");
} }