Fixed merge issues

2018-09-03 12:52:03 -07:00
parent 7a65e48d33
commit 18bf6b6cb8
8 changed files with 389 additions and 234 deletions
--- a/src/Mod/Path/PathScripts/PathEngraveBase.py
+++ b/src/Mod/Path/PathScripts/PathEngraveBase.py
@@ -123,10 +123,9 @@ class ObjectOp(PathOp.ObjectOp):
        params.update({'Z': z, 'F': self.horizFeed})
        self.commandlist.append(Path.Command(cmd.Name, params))

-    def opSetDefaultValues(self, obj):
+    def opSetDefaultValues(self, obj, job):
        '''opSetDefaultValues(obj) ... set depths for engraving'''
        if PathOp.FeatureDepths & self.opFeatures(obj):
-            job = PathUtils.findParentJob(obj)
            if job and len(job.Model.Group) > 0:
                bb = job.Proxy.modelBoundBox(job)
                obj.OpStartDepth = bb.ZMax