diff options
| -rw-r--r-- | cura/Scene/ConvexHullNode.py | 13 | ||||
| -rw-r--r-- | plugins/SolidView/SolidView.py | 2 |
2 files changed, 6 insertions, 9 deletions
diff --git a/cura/Scene/ConvexHullNode.py b/cura/Scene/ConvexHullNode.py index 765dae26a2..3046d04a67 100644 --- a/cura/Scene/ConvexHullNode.py +++ b/cura/Scene/ConvexHullNode.py @@ -80,14 +80,11 @@ class ConvexHullNode(SceneNode): ConvexHullNode.shader.setUniformValue("u_diffuseColor", self._color) ConvexHullNode.shader.setUniformValue("u_opacity", 0.6) - if self.getParent(): - if self.getMeshData() and isinstance(self._node, SceneNode) and self._node.callDecoration("getBuildPlateNumber") == Application.getInstance().getMultiBuildPlateModel().activeBuildPlate: - # The object itself (+ adhesion in one-at-a-time mode) - renderer.queueNode(self, transparent = True, shader = ConvexHullNode.shader, backface_cull = True, sort = -8) - if self._convex_hull_head_mesh: - # The full head. Rendered as a hint to the user: If this area overlaps another object A; this object - # cannot be printed after A, because the head would hit A while printing the current object - renderer.queueNode(self, shader = ConvexHullNode.shader, transparent = True, mesh = self._convex_hull_head_mesh, backface_cull = True, sort = -8) + renderer.queueNode(self, transparent = True, shader = ConvexHullNode.shader, backface_cull = True, sort = -8) + if self._convex_hull_head_mesh: + # The full head. Rendered as a hint to the user: If this area overlaps another object A; this object + # cannot be printed after A, because the head would hit A while printing the current object + renderer.queueNode(self, shader = ConvexHullNode.shader, transparent = True, mesh = self._convex_hull_head_mesh, backface_cull = True, sort = -8) return True diff --git a/plugins/SolidView/SolidView.py b/plugins/SolidView/SolidView.py index 7c0e800247..3ea78d84fb 100644 --- a/plugins/SolidView/SolidView.py +++ b/plugins/SolidView/SolidView.py @@ -167,7 +167,7 @@ class SolidView(View): self._composite_pass.setLayerBindings(["default", "selection", "xray"]) 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() |