mirror of
https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura
synced 2025-08-12 12:49:10 +08:00
CURA-4400 resolve merge conflict
This commit is contained in:
commit
c4fb15a569
@ -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):
|
||||||
|
Loading…
x
Reference in New Issue
Block a user