Merge branch 'master' of ssh://git.code.sf.net/p/free-cad/code

This commit is contained in:
wmayer 2014-03-14 19:39:33 +01:00
commit 599331ef11
2 changed files with 4 additions and 0 deletions

View File

@ -570,6 +570,8 @@ class _Structure(ArchComponent.Component):
base = None
if obj.Base:
if obj.Base.isDerivedFrom("Part::Feature"):
if obj.Base.Shape.isNull():
return
if hasattr(obj,"Tool"):
if obj.Tool:
try:

View File

@ -4536,6 +4536,8 @@ class _Clone(_DraftObject):
shapes = []
for o in obj.Objects:
if o.isDerivedFrom("Part::Feature"):
if o.Shape.isNull():
return
sh = o.Shape.copy()
m = FreeCAD.Matrix()
if hasattr(obj,"Scale") and not sh.isNull():