summaryrefslogtreecommitdiffstats
path: root/src/ui/tools/spray-tool.cpp
diff options
context:
space:
mode:
authorMarc Jeanmougin <marc@jeanmougin.fr>2016-11-09 21:03:39 +0000
committerMarc Jeanmougin <marcjeanmougin@free.fr>2016-11-09 21:03:39 +0000
commitafe611e02639684bc57a4bda796dbd6305ab38a9 (patch)
treeed672d400bfabb4d49d9608b16635f6e77aa414d /src/ui/tools/spray-tool.cpp
parentClick-drag selects nodes rather than creates new mesh if mesh already exists. (diff)
parentMove boolop functions from sp_selected_path_<op> to ObjectSet::path<op> (diff)
downloadinkscape-afe611e02639684bc57a4bda796dbd6305ab38a9.tar.gz
inkscape-afe611e02639684bc57a4bda796dbd6305ab38a9.zip
merge boolop branch: Move boolop functions from sp_selected_path_<op> to ObjectSet::path<op>
(bzr r15232)
Diffstat (limited to 'src/ui/tools/spray-tool.cpp')
-rw-r--r--src/ui/tools/spray-tool.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/ui/tools/spray-tool.cpp b/src/ui/tools/spray-tool.cpp
index 3649008ff..ad006627c 100644
--- a/src/ui/tools/spray-tool.cpp
+++ b/src/ui/tools/spray-tool.cpp
@@ -1026,7 +1026,7 @@ static bool sp_spray_recursive(SPDesktop *desktop,
if (unionResult) { // No need to add the very first item (initialized with NULL).
set->add(unionResult);
}
- sp_selected_path_union_skip_undo(set);
+ set->pathUnion(true);
set->add(parent_item);
Inkscape::GC::release(copy);
did = true;
@@ -1364,7 +1364,7 @@ bool SprayTool::root_handler(GdkEvent* event) {
SP_VERB_CONTEXT_SPRAY, _("Spray with clones"));
break;
case SPRAY_MODE_SINGLE_PATH:
- sp_selected_path_union_skip_undo(objectSet());
+ objectSet()->pathUnion(true);
desktop->getSelection()->add(object_set.objects().begin(), object_set.objects().end());
DocumentUndo::done(this->desktop->getDocument(),
SP_VERB_CONTEXT_SPRAY, _("Spray in single path"));