GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-12 12:49:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of ssh://github.com/Ultimaker/Cura

Browse Source
This commit is contained in:
Ghostkeeper 2021-06-08 16:12:14 +02:00
commit 1f012ce2e4
No known key found for this signature in database
GPG Key ID: 14C3586CD2EFC5B9
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cura/CuraApplication.py
View File

@ -257,6 +257,9 @@ class CuraApplication(QtApplication):
from cura.CuraPackageManager import CuraPackageManager from cura.CuraPackageManager import CuraPackageManager
self._package_manager_class = CuraPackageManager self._package_manager_class = CuraPackageManager
from UM.CentralFileStorage import CentralFileStorage
CentralFileStorage.setIsEnterprise(ApplicationMetadata.IsEnterpriseVersion)
@pyqtProperty(str, constant=True) @pyqtProperty(str, constant=True)
def ultimakerCloudApiRootUrl(self) -> str: def ultimakerCloudApiRootUrl(self) -> str:
return UltimakerCloudConstants.CuraCloudAPIRoot return UltimakerCloudConstants.CuraCloudAPIRoot

7
cura/Scene/CuraSceneNode.py
View File

@ -124,13 +124,14 @@ class CuraSceneNode(SceneNode):
if child.callDecoration("isNonPrintingMesh"): if child.callDecoration("isNonPrintingMesh"):
# Non-printing-meshes inside a group should not affect push apart or drop to build plate # Non-printing-meshes inside a group should not affect push apart or drop to build plate
continue 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. # Child had a degenerate bounding box, such as an empty group. Don't count it along.
continue continue
if self._aabb is None: if self._aabb is None:
self._aabb = child.getBoundingBox() self._aabb = child_bb
else: 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. 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() position = self.getWorldPosition()