Merge branch '2.5'

This commit is contained in:
Jack Ha 2017-03-20 15:17:29 +01:00
commit 6858db5e17
2 changed files with 6 additions and 4 deletions

View file

@ -145,9 +145,11 @@ class ThreeMFReader(MeshReader):
group_decorator = GroupDecorator()
um_node.addDecorator(group_decorator)
um_node.setSelectable(True)
# Assuming that all nodes are printable objects, affects (auto) slicing
sliceable_decorator = SliceableObjectDecorator()
um_node.addDecorator(sliceable_decorator)
if um_node.getMeshData():
# Assuming that all nodes with mesh data are printable objects
# affects (auto) slicing
sliceable_decorator = SliceableObjectDecorator()
um_node.addDecorator(sliceable_decorator)
return um_node
def read(self, file_name):