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

Merge branch '4.8' of github.com:Ultimaker/Cura

Browse Source
This commit is contained in:
Jaime van Kessel 2020-11-04 11:07:38 +01:00
commit 080832fcf2
No known key found for this signature in database
GPG Key ID: 3710727397403C91
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cura/CuraApplication.py
View File

@ -1901,9 +1901,10 @@ class CuraApplication(QtApplication):
if select_models_on_load:
Selection.add(node)
arrange(nodes_to_arrange, self.getBuildVolume(), fixed_nodes)
try:
arrange(nodes_to_arrange, self.getBuildVolume(), fixed_nodes)
except:
Logger.logException("e", "Failed to arrange the models")
self.fileCompleted.emit(file_name)
def addNonSliceableExtension(self, extension):

2
cura/OAuth2/AuthorizationHelpers.py
View File

@ -127,7 +127,7 @@ class AuthorizationHelpers:
user_id = user_data["user_id"],
username = user_data["username"],
profile_image_url = user_data.get("profile_image_url", ""),
organization_id = user_data.get("organization", {}).get("organization_id", ""),
organization_id = user_data.get("organization", {}).get("organization_id"),
subscriptions = user_data.get("subscriptions", [])
)

3
plugins/SliceInfoPlugin/SliceInfo.py
View File

@ -125,7 +125,8 @@ class SliceInfo(QObject, Extension):
data["schema_version"] = 0
data["cura_version"] = self._application.getVersion()
data["cura_build_type"] = ApplicationMetadata.CuraBuildType
data["organization_id"] = user_profile.get("organization_id", None) if user_profile else None
org_id = user_profile.get("organization_id", None) if user_profile else None
data["organization_id"] = org_id if org_id else None
data["subscriptions"] = user_profile.get("subscriptions", []) if user_profile else []
active_mode = self._application.getPreferences().getValue("cura/active_mode")