+ fixed bug in Arch Cells

git-svn-id: https://free-cad.svn.sourceforge.net/svnroot/free-cad/trunk@5266 e8eeb9e2-ec13-0410-a4a9-efa5cf37419d

src/Mod/Arch/Cell.py

@@ -89,12 +89,23 @@ class _Cell(Component.Component):
         pl = obj.Placement
         if obj.Components:
             if obj.JoinMode:
-                components = obj.Components[:]
+                walls = []
-                f = components.pop(0)
+                structs = []
-                baseShape = f.Shape
+                compshapes = []
-                for comp in components:
+                for comp in obj.Components:
-                    if Draft.getType(comp) in ["Wall","Cell","Shape"]:
+                    if Draft.getType(comp) == "Wall":
-                        baseShape = baseShape.oldFuse(comp.Shape)
+                        walls.append(comp.Shape)
+                    elif Draft.getType(comp) == "Structure":
+                        structs.append(comp.Shape)
+                    else:
+                        compshapes.append(comp.Shape)
+                for gr in [walls,structs]:
+                    if gr:
+                        sh = gr.pop(0)
+                        for csh in gr:
+                            sh = sh.oldFuse(csh)
+                        compshapes.append(sh)
+                baseShape = Part.makeCompound(compshapes)
             else:
                 compshapes = []
                 for o in obj.Components: