CURA-4525 fix convex hull, changed size of object list

This commit is contained in:
Jack Ha 2018-01-03 12:47:09 +01:00
parent 663ceab069
commit c8243a0ddd
2 changed files with 3 additions and 3 deletions

View file

@ -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)

View file

@ -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]
}