diff --git a/src/Mod/Arch/importDAE.py b/src/Mod/Arch/importDAE.py index 077e4702e..4b223fe49 100644 --- a/src/Mod/Arch/importDAE.py +++ b/src/Mod/Arch/importDAE.py @@ -21,7 +21,7 @@ #* * #*************************************************************************** -import FreeCAD, Mesh, os, numpy, MeshPart +import FreeCAD, Mesh, os, numpy, MeshPart, Arch, Draft if FreeCAD.GuiUp: from DraftTools import translate else: @@ -145,7 +145,9 @@ def export(exportList,filename,tessellation=1): colmesh.materials.append(mat) objind = 0 scenenodes = [] - for obj in exportList: + objectslist = Draft.getGroupContents(exportList,walls=True,addgroups=True) + objectslist = Arch.pruneIncluded(objectslist) + for obj in objectslist: vindex = [] nindex = [] findex = [] diff --git a/src/Mod/Arch/importOBJ.py b/src/Mod/Arch/importOBJ.py index cfefd2843..d027b52f7 100644 --- a/src/Mod/Arch/importOBJ.py +++ b/src/Mod/Arch/importOBJ.py @@ -21,7 +21,7 @@ #* * #*************************************************************************** -import FreeCAD, DraftGeomUtils, Part, Draft +import FreeCAD, DraftGeomUtils, Part, Draft, Arch if FreeCAD.GuiUp: from DraftTools import translate else: @@ -108,7 +108,9 @@ def export(exportList,filename): outfile.write("# FreeCAD v" + ver[0] + "." + ver[1] + " build" + ver[2] + " Arch module\n") outfile.write("# http://www.freecadweb.org\n") offset = 1 - for obj in exportList: + objectslist = Draft.getGroupContents(exportList,walls=True,addgroups=True) + objectslist = Arch.pruneIncluded(objectslist) + for obj in objectslist: if obj.isDerivedFrom("Part::Feature"): if obj.ViewObject.isVisible(): vlist,elist,flist = getIndices(obj.Shape,offset)