3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-15 02:37:49 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

CURA-4400 resolve merge conflict

Browse source
This commit is contained in:
Jack Ha 2018-03-12 15:18:35 +01:00
commit c4fb15a569
1 changed files with 4 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

16
cura/Settings/MachineManager.py
View file

@ -1004,21 +1004,13 @@ class MachineManager(QObject):
def activeMaterialsCompatible(self): def activeMaterialsCompatible(self):
# check material - variant compatibility # 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)): if Util.parseBool(self._global_container_stack.getMetaDataEntry("has_materials", False)):
for position, extruder in self._global_container_stack.extruders.items(): for position, extruder in self._global_container_stack.extruders.items():
if extruder.isEnabled and not extruder.material.getMetaDataEntry("compatible"): if extruder.isEnabled and not extruder.material.getMetaDataEntry("compatible"):
result = False return False
break if not extruder.material.getMetaDataEntry("compatible"):
if machine_has_buildplate: return False
buildplate_compatibility_dict = extruder.material.getMetaDataEntry("buildplate_compatible") return True
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 ## Update current quality type and machine after setting material
def _updateQualityWithMaterial(self): def _updateQualityWithMaterial(self):