summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/path-chemistry.cpp3
-rw-r--r--src/ui/dialog/inkscape-preferences.cpp2
-rw-r--r--src/verbs.cpp2
3 files changed, 3 insertions, 4 deletions
diff --git a/src/path-chemistry.cpp b/src/path-chemistry.cpp
index d87dd96cd..9e75b7841 100644
--- a/src/path-chemistry.cpp
+++ b/src/path-chemistry.cpp
@@ -56,9 +56,6 @@ ObjectSet::combine(bool skip_undo)
//Inkscape::Selection *selection = desktop->getSelection();
SPDocument *doc = document();
Inkscape::Preferences *prefs = Inkscape::Preferences::get();
- if (prefs->getBool("/options/pathoperationsunlink/value", true)) {
- unlinkRecursive(true);
- }
std::vector<SPItem*> items_copy(items().begin(), items().end());
if (items_copy.size() < 1) {
diff --git a/src/ui/dialog/inkscape-preferences.cpp b/src/ui/dialog/inkscape-preferences.cpp
index 562617e6d..dcc3033fa 100644
--- a/src/ui/dialog/inkscape-preferences.cpp
+++ b/src/ui/dialog/inkscape-preferences.cpp
@@ -1397,7 +1397,7 @@ void InkscapePreferences::initPageBehavior()
_page_clones.add_group_header( _("Unlinking clones"));
_clone_to_curves.init ( _("Path operations unlink clones"), "/options/pathoperationsunlink/value", true);
_page_clones.add_line(true, "", _clone_to_curves, "",
- _("The following path operations will unlink clones: Stroke to path, Boolean operations, Object to Path, Combine"));
+ _("The following path operations will unlink clones: Stroke to path, Object to Path, Boolean operations, Combine and Break Apart"));
//TRANSLATORS: Heading for the Inkscape Preferences "Clones" Page
this->AddPage(_page_clones, _("Clones"), iter_behavior, PREFS_PAGE_BEHAVIOR_CLONES);
diff --git a/src/verbs.cpp b/src/verbs.cpp
index dc378de7c..212fcf357 100644
--- a/src/verbs.cpp
+++ b/src/verbs.cpp
@@ -1288,9 +1288,11 @@ void SelectionVerb::perform(SPAction *action, void *data)
break;
case SP_VERB_SELECTION_COMBINE:
+ selection->toCurves(true);
selection->combine();
break;
case SP_VERB_SELECTION_BREAK_APART:
+ selection->toCurves(true);
selection->breakApart();
break;
case SP_VERB_SELECTION_ARRANGE: