summaryrefslogtreecommitdiffstats
path: root/src/persp3d.cpp
diff options
context:
space:
mode:
authorMaximilian Albert <maximilian.albert@gmail.com>2007-12-26 22:35:54 +0000
committercilix42 <cilix42@users.sourceforge.net>2007-12-26 22:35:54 +0000
commitda9c97afb1d035ac4d716d5d365dc527e4ee732b (patch)
treefef96db4b84a5d1f23263ade3dedbd8d09fd4a67 /src/persp3d.cpp
parentcheck for cairo version (diff)
downloadinkscape-da9c97afb1d035ac4d716d5d365dc527e4ee732b.tar.gz
inkscape-da9c97afb1d035ac4d716d5d365dc527e4ee732b.zip
Recompute box corners relative to new perspective when merging persps (to prevent boxes from jumping randomly)
(bzr r4311)
Diffstat (limited to 'src/persp3d.cpp')
-rw-r--r--src/persp3d.cpp10
1 files changed, 2 insertions, 8 deletions
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<SPBox3D *> 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<SPBox3D *>::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