From 7eba38b286b22fb1d14c19bc71d3e8e9b856bc99 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Fri, 21 May 2021 13:53:55 +0200 Subject: [PATCH 1/2] Check if child bounding box is None before checking if it's degenerate. Contributes to issue CURA-7873. --- cura/Scene/CuraSceneNode.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/cura/Scene/CuraSceneNode.py b/cura/Scene/CuraSceneNode.py index 9b5c432b36..e3d0b30dd3 100644 --- a/cura/Scene/CuraSceneNode.py +++ b/cura/Scene/CuraSceneNode.py @@ -124,13 +124,14 @@ class CuraSceneNode(SceneNode): if child.callDecoration("isNonPrintingMesh"): # Non-printing-meshes inside a group should not affect push apart or drop to build plate continue - if child.getBoundingBox().minimum == child.getBoundingBox().maximum: + child_bb = child.getBoundingBox() + if child_bb is None or child_bb.minimum == child_bb.maximum: # Child had a degenerate bounding box, such as an empty group. Don't count it along. continue if self._aabb is None: - self._aabb = child.getBoundingBox() + self._aabb = child_bb else: - self._aabb = self._aabb + child.getBoundingBox() + self._aabb = self._aabb + child_bb if self._aabb is None: # No children that should be included? Just use your own position then, but it's an invalid AABB. position = self.getWorldPosition() From 633002865cb19c7ccd6dbb6b3397dfeac3d64229 Mon Sep 17 00:00:00 2001 From: Konstantinos Karmas Date: Tue, 8 Jun 2021 15:12:33 +0200 Subject: [PATCH 2/2] Set enterprise edition on initialization CURA-8291 --- cura/CuraApplication.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/cura/CuraApplication.py b/cura/CuraApplication.py index ea9eb97376..56b86c9de0 100755 --- a/cura/CuraApplication.py +++ b/cura/CuraApplication.py @@ -257,6 +257,9 @@ class CuraApplication(QtApplication): from cura.CuraPackageManager import CuraPackageManager self._package_manager_class = CuraPackageManager + from UM.CentralFileStorage import CentralFileStorage + CentralFileStorage.setIsEnterprise(ApplicationMetadata.IsEnterpriseVersion) + @pyqtProperty(str, constant=True) def ultimakerCloudApiRootUrl(self) -> str: return UltimakerCloudConstants.CuraCloudAPIRoot