3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-24 07:03:56 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

resolve conflicts

Browse source
This commit is contained in:
ChrisTerBeke 2017-10-26 09:26:18 +02:00
commit 0377edaa0f
1 changed files with 3 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

3
cura/Settings/ProfilesModel.py
View file

@ -167,6 +167,8 @@ class ProfilesModel(InstanceContainersModel):
for item in containers:
profile = container_registry.findContainers(id = item["id"])
Logger.log("d", "profile=%s, id=%s", profile, item["id"])
# when the profile is not supported
if not profile:
self._setItemLayerHeight(item, "", "")
@ -184,6 +186,7 @@ class ProfilesModel(InstanceContainersModel):
continue
item["available"] = profile in qualities
Logger.log("d", "---- profile available = [%s] , qualities = [%s]", item["available"], [q.getId() for q in qualities])
# Easy case: This profile defines its own layer height.
if profile.hasProperty("layer_height", "value"):