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

assembly: cancel auto solve on undo/redo

Browse Source
This commit is contained in:
Zheng, Lei 2018-12-22 17:05:09 +08:00
parent eeda4c8512
commit cfb6934ecc
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
assembly.py
View File

@ -1123,6 +1123,8 @@ class AsmElementLink(AsmBase):
self.getInfo(True) self.getInfo(True)
return return
if prop == 'Label': if prop == 'Label':
if obj.Document and getattr(obj.Document,'Transacting',False):
return
link = getattr(obj,'LinkedObject',None) link = getattr(obj,'LinkedObject',None)
if isinstance(link,tuple): if isinstance(link,tuple):
linked = link[0].getSubObject(link[1],1) linked = link[0].getSubObject(link[1],1)
@ -2824,6 +2826,9 @@ class Assembly(AsmGroup):
@classmethod @classmethod
def autoSolve(cls,obj,prop,force=False): def autoSolve(cls,obj,prop,force=False):
if obj.Document and getattr(obj.Document,'Transacting',False):
cls.cancelAutoSolve()
return
if not force and cls._PendingSolve: if not force and cls._PendingSolve:
return return
if force or cls.canAutoSolve(): if force or cls.canAutoSolve():