Merge branch '3.4'

This commit is contained in:
Ghostkeeper 2018-06-01 14:03:05 +02:00
commit 4157636552
No known key found for this signature in database
GPG key ID: 5252B696FB5E7C7A
4 changed files with 8 additions and 9 deletions

View file

@ -98,8 +98,7 @@ class CuraStackBuilder:
position = position,
variant_container = extruder_variant_container,
material_container = material_container,
quality_container = application.empty_quality_container,
global_stack = new_global_stack,
quality_container = application.empty_quality_container
)
new_extruder.setNextStack(new_global_stack)
new_global_stack.addExtruder(new_extruder)
@ -138,7 +137,7 @@ class CuraStackBuilder:
@classmethod
def createExtruderStack(cls, new_stack_id: str, extruder_definition: DefinitionContainerInterface, machine_definition_id: str,
position: int,
variant_container, material_container, quality_container, global_stack) -> ExtruderStack:
variant_container, material_container, quality_container) -> ExtruderStack:
from cura.CuraApplication import CuraApplication
application = CuraApplication.getInstance()
registry = application.getContainerRegistry()