GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-16 14:55:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2.5'

Browse Source
This commit is contained in:
Tim Kuipers 2017-03-10 16:00:57 +01:00
commit 0f6c47f467
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
plugins/3MFReader/ThreeMFReader.py
View File

@ -92,7 +92,12 @@ class ThreeMFReader(MeshReader):
um_node.setMeshData(mesh_data) um_node.setMeshData(mesh_data)
for child in savitar_node.getChildren(): for child in savitar_node.getChildren():
um_node.addChild(self._convertSavitarNodeToUMNode(child)) child_node = self._convertSavitarNodeToUMNode(child)
if child_node:
um_node.addChild(child_node)
if um_node.getMeshData() is None and len(um_node.getChildren()) == 0:
return None
settings = savitar_node.getSettings() settings = savitar_node.getSettings()
@ -152,6 +157,8 @@ class ThreeMFReader(MeshReader):
self._unit = scene_3mf.getUnit() self._unit = scene_3mf.getUnit()
for node in scene_3mf.getSceneNodes(): for node in scene_3mf.getSceneNodes():
um_node = self._convertSavitarNodeToUMNode(node) um_node = self._convertSavitarNodeToUMNode(node)
if um_node is None:
continue
# compensate for original center position, if object(s) is/are not around its zero position # compensate for original center position, if object(s) is/are not around its zero position
transform_matrix = Matrix() transform_matrix = Matrix()

6
resources/definitions/fdmprinter.def.json
View File

@ -1318,10 +1318,10 @@
"enabled": "expand_upper_skins or expand_lower_skins", "enabled": "expand_upper_skins or expand_lower_skins",
"settable_per_mesh": true "settable_per_mesh": true
}, },
"min_skin_angle_for_expansion": "max_skin_angle_for_expansion":
{ {
"label": "Minimum Skin Angle for Expansion", "label": "Maximum Skin Angle for Expansion",
"description": "Top and or bottom surfaces of your object with an angle larger than this setting, won't have their top/bottom skin expanded. This avoids expanding the narrow skin areas that are created when the model surface has a near vertical slope.", "description": "Top and or bottom surfaces of your object with an angle larger than this setting, won't have their top/bottom skin expanded. This avoids expanding the narrow skin areas that are created when the model surface has a near vertical slope. An angle of 0° is horizontal, while an angle of 90° is vertical.",
"unit": "°", "unit": "°",
"type": "float", "type": "float",
"minimum_value": "0", "minimum_value": "0",