Merge branch 'master' of https://github.com/FreeCAD/FreeCAD

FreeCAD · Aug 20, 2016 · ae663b3 · ae663b3
2 parents f3f0f5b + 0a8ed56
commit ae663b3
Show file tree

Hide file tree

Showing 3 changed files with 289 additions and 262 deletions.
diff --git a/src/Mod/Arch/ArchComponent.py b/src/Mod/Arch/ArchComponent.py
@@ -772,7 +772,7 @@ def claimChildren(self):
                     if Draft.getType(self.Object) == "Wall":
                         if Draft.getType(s) == "Roof":
                             continue
-                    if (Draft.getType(s) == "Window") or Draft.isCloneOf(s,"Window"):
+                    if (Draft.getType(s) == "Window") or Draft.isClone(s,"Window"):
                         if not swalW:
                             continue
                     c.append(s)