Merge branch 'master' of ssh://git.code.sf.net/p/free-cad/code
This commit is contained in:
commit
599331ef11
|
@ -570,6 +570,8 @@ class _Structure(ArchComponent.Component):
|
||||||
base = None
|
base = None
|
||||||
if obj.Base:
|
if obj.Base:
|
||||||
if obj.Base.isDerivedFrom("Part::Feature"):
|
if obj.Base.isDerivedFrom("Part::Feature"):
|
||||||
|
if obj.Base.Shape.isNull():
|
||||||
|
return
|
||||||
if hasattr(obj,"Tool"):
|
if hasattr(obj,"Tool"):
|
||||||
if obj.Tool:
|
if obj.Tool:
|
||||||
try:
|
try:
|
||||||
|
|
|
@ -4536,6 +4536,8 @@ class _Clone(_DraftObject):
|
||||||
shapes = []
|
shapes = []
|
||||||
for o in obj.Objects:
|
for o in obj.Objects:
|
||||||
if o.isDerivedFrom("Part::Feature"):
|
if o.isDerivedFrom("Part::Feature"):
|
||||||
|
if o.Shape.isNull():
|
||||||
|
return
|
||||||
sh = o.Shape.copy()
|
sh = o.Shape.copy()
|
||||||
m = FreeCAD.Matrix()
|
m = FreeCAD.Matrix()
|
||||||
if hasattr(obj,"Scale") and not sh.isNull():
|
if hasattr(obj,"Scale") and not sh.isNull():
|
||||||
|
|
Loading…
Reference in New Issue
Block a user