Abort OP creation transaction if TC selection is aborted with cancel, #3274

This commit is contained in:
Markus Lampert
2017-11-27 15:04:26 -08:00
committed by Yorik van Havre
parent 53dc025ca1
commit c38eee06e2
5 changed files with 17 additions and 9 deletions

View File

@@ -149,8 +149,8 @@ class ObjectOp(object):
self.initOperation(obj)
obj.Proxy = self
self.setDefaultValues(obj)
if self.setDefaultValues(obj):
obj.Proxy = self
def onDocumentRestored(self, obj):
features = self.opFeatures(obj)
@@ -244,6 +244,8 @@ class ObjectOp(object):
if FeatureTool & features:
obj.ToolController = PathUtils.findToolController(obj)
if not obj.ToolController:
return False
obj.OpToolDiameter = 1.0
if FeatureDepths & features:
@@ -273,6 +275,7 @@ class ObjectOp(object):
self.opSetDefaultValues(obj)
obj.recompute()
return True
def _setBaseAndStock(self, obj, ignoreErrors=False):
job = PathUtils.findParentJob(obj)