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

This commit is contained in:
Tim Kuipers 2016-03-24 17:30:10 +01:00
commit cb43dfb964

View File

@ -80,7 +80,7 @@ class ThreeMFReader(MeshReader):
transformation = root.findall("./3mf:build/3mf:item[@objectid='{0}']".format(object.get("id")), self._namespaces) transformation = root.findall("./3mf:build/3mf:item[@objectid='{0}']".format(object.get("id")), self._namespaces)
if transformation: if transformation:
transformation = transformation[0] transformation = transformation[0]
try:
if transformation.get("transform"): if transformation.get("transform"):
splitted_transformation = transformation.get("transform").split() splitted_transformation = transformation.get("transform").split()
## Transformation is saved as: ## Transformation is saved as:
@ -107,6 +107,8 @@ class ThreeMFReader(MeshReader):
temp_mat._data[2,3] = splitted_transformation[11] temp_mat._data[2,3] = splitted_transformation[11]
node.setTransformation(temp_mat) node.setTransformation(temp_mat)
except AttributeError:
pass # Empty list was found. Getting transformation is not possible
result.addChild(node) result.addChild(node)