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

Solved merge conflict

Browse source
This commit is contained in:
Jack Ha 2018-03-12 11:39:39 +01:00
commit aa3cd8ba9d
5 changed files with 22 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
cura/Settings/MachineManager.py
View file

@ -988,11 +988,21 @@ class MachineManager(QObject):
def activeMaterialsCompatible(self):
# check material - variant compatibility
result = True
machine_has_buildplate = Util.parseBool(self._global_container_stack.getMetaDataEntry("has_variant_buildplates", False))
if Util.parseBool(self._global_container_stack.getMetaDataEntry("has_materials", False)):
for position, extruder in self._global_container_stack.extruders.items():
if extruder.isEnabled and not extruder.material.getMetaDataEntry("compatible"):
return False
return True
result = False
break
if machine_has_buildplate:
buildplate_compatibility_dict = extruder.material.getMetaDataEntry("buildplate_compatible")
if buildplate_compatibility_dict:
buildplate_name = self._global_container_stack.variant.getName()
result = buildplate_compatibility_dict.get(buildplate_name, True)
if not result:
break
return result
## Update current quality type and machine after setting material
def _updateQualityWithMaterial(self):