Fixed merge issues

2018-09-02 00:31:56 -07:00
parent 67987cc916
commit ec8e97c262
3 changed files with 18 additions and 12 deletions
--- a/src/Mod/Path/PathScripts/PathAreaOp.py
+++ b/src/Mod/Path/PathScripts/PathAreaOp.py
@@ -136,7 +136,7 @@ class ObjectOp(PathOp.ObjectOp):
        '''areaOpOnDocumentRestored(obj) ... overwrite to fully restore receiver'''
        pass

-    def opSetDefaultValues(self, obj):
+    def opSetDefaultValues(self, obj, job):
        '''opSetDefaultValues(obj) ... base implementation, do not overwrite.
        The base implementation sets the depths and heights based on the
        areaOpShapeForDepths() return value.