diff --git a/src/splivarot.cpp b/src/splivarot.cpp
index f2a115f43c9657f3a031e83929e1d6a76ec42281..33970f6a23161d737705b1359da934e13183d661 100644 (file)
--- a/src/splivarot.cpp
+++ b/src/splivarot.cpp
#include "svg/svg.h"
#include "sp-path.h"
#include "sp-shape.h"
+#include "sp-image.h"
#include "marker.h"
#include "enums.h"
#include "sp-text.h"
sp_selected_path_boolop(bool_op_union, SP_VERB_SELECTION_UNION, _("Union"));
}
+void
+sp_selected_path_union_skip_undo()
+{
+ sp_selected_path_boolop(bool_op_union, SP_VERB_NONE, _("Union"));
+}
+
void
sp_selected_path_intersect()
{
@@ -474,7 +481,7 @@ sp_selected_path_boolop(bool_op bop, const unsigned int verb, const Glib::ustrin
// premultiply by the inverse of parent's repr
SPItem *parent_item = SP_ITEM(sp_desktop_document(desktop)->getObjectByRepr(parent));
NR::Matrix local = sp_item_i2doc_affine(parent_item);
- gchar *transform = sp_svg_transform_write(local);
+ gchar *transform = sp_svg_transform_write(local.inverse());
// now that we have the result, add it on the canvas
if ( bop == bool_op_cut || bop == bool_op_slice ) {
@@ -573,7 +580,9 @@ sp_selected_path_boolop(bool_op bop, const unsigned int verb, const Glib::ustrin
g_free(transform);
- sp_document_done(sp_desktop_document(desktop), verb, description);
+ if (verb != SP_VERB_NONE) {
+ sp_document_done(sp_desktop_document(desktop), verb, description);
+ }
delete res;
}
tr = marker_item->transform * marker->c2p * tr * transform;
if (SP_OBJECT_REPR(marker_item)) {
- Inkscape::XML::Node *m_repr = SP_OBJECT_REPR(marker_item)->duplicate();
+ Inkscape::XML::Node *m_repr = SP_OBJECT_REPR(marker_item)->duplicate(xml_doc);
g_repr->appendChild(m_repr);
SPItem *marker_item = (SPItem *) sp_desktop_document(desktop)->getObjectByRepr(m_repr);
sp_item_write_transform(marker_item, m_repr, tr);
{
curve = SP_TEXT(item)->getNormalizedBpath();
}
+ else if (SP_IS_IMAGE(item))
+ {
+ curve = sp_image_get_curve(SP_IMAGE(item));
+ }
else
{
curve = NULL;