suzanne.soy/FreeCAD_assembly3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

assembly: fix backward compability

Browse Source
This commit is contained in:
Zheng, Lei 2020-02-17 18:14:02 +08:00
parent 357282a1b4
commit 72ff4a98a3
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
freecad/asm3/assembly.py
View File

@ -29,8 +29,22 @@ def hasProperty(obj,prop):
try: try:
obj.getPropertyByName(prop,1) obj.getPropertyByName(prop,1)
return True return True
except Exception: except AttributeError:
return False return False
except Exception:
# work around for older FC where getPropertyByName() only accepts one
# argument
try:
obj.getPropertyByName(prop)
except Exception:
return False
if obj.isDerivedFrom('App::DocumentObject'):
linked = obj.getLinkedObject(True)
elif obj.isDerivedFrom('Gui::ViewProviderDocumentObject'):
linked = obj.Object.getLinkedObject(True).ViewObject
else:
return True
return linked == obj or not hasattr(linked,prop)
def getLinkProperty(obj,name,default=None,writable=False): def getLinkProperty(obj,name,default=None,writable=False):
try: try: