GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-19 01:15:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Jaime van Kessel 2016-09-07 15:29:38 +02:00
commit 304b958753
2 changed files with 5 additions and 2 deletions
Show Stats 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. ## Create a new container with container 2 as base and container 1 written over it.
def _createFlattenedContainerInstance(self, instance_container1, instance_container2): def _createFlattenedContainerInstance(self, instance_container1, instance_container2):
flat_container = InstanceContainer(instance_container2.getName()) 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()) flat_container.setMetaData(instance_container2.getMetaData())
for key in instance_container2.getAllKeys(): for key in instance_container2.getAllKeys():

2
resources/definitions/ultimaker_original_dual.def.json
View File

@ -78,7 +78,7 @@
"default_value": 185 "default_value": 185
}, },
"prime_tower_position_y": { "prime_tower_position_y": {
"default_value": 175 "default_value": 160
} }
} }
} }