3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-11-23 19:01:05 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch '2.3' of https://github.com/Ultimaker/Cura into 2.3

Browse source
This commit is contained in:
fieldOfView 2016-09-07 15:38:39 +02:00
commit 20c9cb2547
1 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
plugins/GCodeWriter/GCodeWriter.py
View file

@ -66,7 +66,10 @@ class GCodeWriter(MeshWriter):
## Create a new container with container 2 as base and container 1 written over it.
def _createFlattenedContainerInstance(self, instance_container1, instance_container2):
flat_container = InstanceContainer(instance_container2.getName())
flat_container.setDefinition(instance_container2.getDefinition())
if instance_container1.getDefinition():
flat_container.setDefinition(instance_container1.getDefinition())
else:
flat_container.setDefinition(instance_container2.getDefinition())
flat_container.setMetaData(instance_container2.getMetaData())
for key in instance_container2.getAllKeys():