diff options
| author | Jabier Arraiza <jabier.arraiza@marker.es> | 2017-11-03 00:10:02 +0000 |
|---|---|---|
| committer | Jabier Arraiza <jabier.arraiza@marker.es> | 2017-11-03 00:10:02 +0000 |
| commit | d2df0412f728dd5bb54537dfdfe7c35b34d40e0e (patch) | |
| tree | e2703384779e83312c456399999997fcc289c5cf /src/object-set.h | |
| parent | Merge branch 'master' into powerpencil (diff) | |
| parent | change assignment to equality (diff) | |
| download | inkscape-d2df0412f728dd5bb54537dfdfe7c35b34d40e0e.tar.gz inkscape-d2df0412f728dd5bb54537dfdfe7c35b34d40e0e.zip | |
Merge branch 'master' into powerpencil
Diffstat (limited to 'src/object-set.h')
| -rw-r--r-- | src/object-set.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/object-set.h b/src/object-set.h index 82d2988c7..a8061593a 100644 --- a/src/object-set.h +++ b/src/object-set.h @@ -370,7 +370,7 @@ public: bool unlinkRecursive(const bool skip_undo = false); void relink(); void cloneOriginal(); - void cloneOriginalPathLPE(); + void cloneOriginalPathLPE(bool allow_transforms = false); Inkscape::XML::Node* group(); void popFromGroup(); void ungroup(); @@ -476,6 +476,7 @@ protected: private: BoolOpErrors pathBoolOp(bool_op bop, const bool skip_undo, const unsigned int verb = SP_VERB_NONE, const Glib::ustring description = ""); + void _disconnect(SPObject* object); }; |