From da9c97afb1d035ac4d716d5d365dc527e4ee732b Mon Sep 17 00:00:00 2001 From: Maximilian Albert Date: Wed, 26 Dec 2007 22:35:54 +0000 Subject: Recompute box corners relative to new perspective when merging persps (to prevent boxes from jumping randomly) (bzr r4311) --- src/persp3d.cpp | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'src/persp3d.cpp') diff --git a/src/persp3d.cpp b/src/persp3d.cpp index 05a699446..1029516f7 100644 --- a/src/persp3d.cpp +++ b/src/persp3d.cpp @@ -529,16 +529,10 @@ persp3d_absorb(Persp3D *persp1, Persp3D *persp2) { // otherwise the loop below gets confused when perspectives are reattached. std::list boxes_of_persp2 = persp3d_list_of_boxes(persp2); - Inkscape::XML::Node *persp_repr = SP_OBJECT_REPR(persp1); - const gchar *persp_id = persp_repr->attribute("id"); - gchar *href = g_strdup_printf("#%s", persp_id); - for (std::list::iterator i = boxes_of_persp2.begin(); i != boxes_of_persp2.end(); ++i) { - SP_OBJECT_REPR(*i)->setAttribute("inkscape:perspectiveID", href); + box3d_switch_perspectives((*i), persp2, persp1, true); + SP_OBJECT(*i)->updateRepr(SP_OBJECT_WRITE_EXT); // so that undo/redo can do its job properly } - g_free(href); - - persp1->boxes.insert(persp1->boxes.begin(), persp2->boxes.begin(), persp2->boxes.end()); } static void -- cgit v1.2.3