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

Merge branch 'CURA-7404_fix_xray_green' of github.com:Ultimaker/Cura

Browse source
This commit is contained in:
Jaime van Kessel 2020-04-29 14:59:53 +02:00
commit 1775903335
No known key found for this signature in database
GPG key ID: 3710727397403C91
3 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
plugins/SolidView/SolidView.py
View file

@ -149,6 +149,7 @@ class SolidView(View):
theme = Application.getInstance().getTheme()
self._xray_composite_shader.setUniformValue("u_background_color", Color(*theme.getColor("viewport_background").getRgb()))
self._xray_composite_shader.setUniformValue("u_outline_color", Color(*theme.getColor("model_selection_outline").getRgb()))
self._xray_composite_shader.setUniformValue("u_flat_error_color_mix", 0.) # Don't show flat error color in solid-view.
renderer = self.getRenderer()
if not self._composite_pass or not 'xray' in self._composite_pass.getLayerBindings():

1
plugins/XRayView/XRayView.py
View file

@ -93,6 +93,7 @@ class XRayView(CuraView):
theme = Application.getInstance().getTheme()
self._xray_composite_shader.setUniformValue("u_background_color", Color(*theme.getColor("viewport_background").getRgb()))
self._xray_composite_shader.setUniformValue("u_outline_color", Color(*theme.getColor("model_selection_outline").getRgb()))
self._xray_composite_shader.setUniformValue("u_flat_error_color_mix", 1.) # Show flat error color _only_ in xray-view.
if not self._composite_pass:
self._composite_pass = self.getRenderer().getRenderPass("composite")