From c8243a0dddd1fdc07edea8240c0de990a979fb26 Mon Sep 17 00:00:00 2001 From: Jack Ha Date: Wed, 3 Jan 2018 12:47:09 +0100 Subject: [PATCH] CURA-4525 fix convex hull, changed size of object list --- cura/ConvexHullNode.py | 4 ++-- resources/themes/cura-light/theme.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cura/ConvexHullNode.py b/cura/ConvexHullNode.py index cec9d3d698..02d8ed833c 100644 --- a/cura/ConvexHullNode.py +++ b/cura/ConvexHullNode.py @@ -64,8 +64,8 @@ class ConvexHullNode(SceneNode): ConvexHullNode.shader.setUniformValue("u_diffuseColor", self._color) ConvexHullNode.shader.setUniformValue("u_opacity", 0.6) - if self.getParent() and self.getParent().callDecoration("getBuildPlateNumber") == Application.getInstance().getBuildPlateModel().activeBuildPlate: - if self.getMeshData(): + if self.getParent(): + if self.getMeshData() and issubclass(type(self._node), SceneNode) and self._node.callDecoration("getBuildPlateNumber") == Application.getInstance().getBuildPlateModel().activeBuildPlate: renderer.queueNode(self, transparent = True, shader = ConvexHullNode.shader, backface_cull = True, sort = -8) if self._convex_hull_head_mesh: renderer.queueNode(self, shader = ConvexHullNode.shader, transparent = True, mesh = self._convex_hull_head_mesh, backface_cull = True, sort = -8) diff --git a/resources/themes/cura-light/theme.json b/resources/themes/cura-light/theme.json index 18f2650e77..5b3e2f019a 100644 --- a/resources/themes/cura-light/theme.json +++ b/resources/themes/cura-light/theme.json @@ -394,7 +394,7 @@ "jobspecs_line": [2.0, 2.0], "objects_menu_size": [20, 40], - "objects_menu_size_collapsed": [15, 15], + "objects_menu_size_collapsed": [15, 17], "build_plate_selection_size": [15, 5], "objects_menu_button": [0.3, 2.7] }