diff options
| author | Nino van Hooff <ninovanhooff@gmail.com> | 2020-05-28 18:31:24 +0300 |
|---|---|---|
| committer | Nino van Hooff <ninovanhooff@gmail.com> | 2020-05-28 18:31:24 +0300 |
| commit | 58ffc9dcae0020d7dd4f3c32b41922dfdbef37d3 (patch) | |
| tree | 54902883427fa76a9dffb5068afd99532563cb4b /cura/Scene | |
| parent | c2c96faf5fcbad942f8cf257e75c94a623ac5eaa (diff) | |
| parent | 2a70813d030c678181b5c37fc82cb513d689187b (diff) | |
Merge remote-tracking branch 'origin/master' into doxygen_to_restructuredtext_comments
# Conflicts:
# cura/API/__init__.py
# cura/Settings/CuraContainerRegistry.py
# cura/Settings/ExtruderManager.py
# plugins/PostProcessingPlugin/scripts/PauseAtHeight.py
# plugins/UM3NetworkPrinting/src/Cloud/CloudApiClient.py
# plugins/UM3NetworkPrinting/src/Cloud/ToolPathUploader.py
# plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDeviceManager.py
Diffstat (limited to 'cura/Scene')
| -rw-r--r-- | cura/Scene/ConvexHullDecorator.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cura/Scene/ConvexHullDecorator.py b/cura/Scene/ConvexHullDecorator.py index 3dee409761..df496aa401 100644 --- a/cura/Scene/ConvexHullDecorator.py +++ b/cura/Scene/ConvexHullDecorator.py @@ -241,7 +241,7 @@ class ConvexHullDecorator(SceneNodeDecorator): if self._node is None: return None if self._node.callDecoration("isGroup"): - points = numpy.zeros((0, 2), dtype=numpy.int32) + points = numpy.zeros((0, 2), dtype = numpy.int32) for child in self._node.getChildren(): child_hull = child.callDecoration("_compute2DConvexHull") if child_hull: @@ -285,7 +285,7 @@ class ConvexHullDecorator(SceneNodeDecorator): # Do not throw away vertices: the convex hull may be too small and objects can collide. # vertex_data = vertex_data[vertex_data[:,1] >= -0.01] - if len(vertex_data) >= 4: # type: ignore # mypy and numpy don't play along well just yet. + if vertex_data is not None and len(vertex_data) >= 4: # type: ignore # mypy and numpy don't play along well just yet. # Round the vertex data to 1/10th of a mm, then remove all duplicate vertices # This is done to greatly speed up further convex hull calculations as the convex hull # becomes much less complex when dealing with highly detailed models. |