summaryrefslogtreecommitdiffstats
path: root/src/sp-item-group.cpp
diff options
context:
space:
mode:
authorroot <root@jtx.marker.es>2013-09-26 20:30:21 +0000
committerroot <root@jtx.marker.es>2013-09-26 20:30:21 +0000
commit264ef999acc789934e0e3956e953fddbc796d8b1 (patch)
treee842cea47c58a328b6f3e7d35fe9bbc7c1c074e7 /src/sp-item-group.cpp
parentFixing ending selection (diff)
parentFix for Bug #1229605 (inkscape crashes when canceled import pdf). (diff)
downloadinkscape-264ef999acc789934e0e3956e953fddbc796d8b1.tar.gz
inkscape-264ef999acc789934e0e3956e953fddbc796d8b1.zip
update to trunk
(bzr r12588.1.7)
Diffstat (limited to 'src/sp-item-group.cpp')
-rw-r--r--src/sp-item-group.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/sp-item-group.cpp b/src/sp-item-group.cpp
index bdcfe46d0..a99a3e988 100644
--- a/src/sp-item-group.cpp
+++ b/src/sp-item-group.cpp
@@ -472,8 +472,8 @@ sp_item_group_ungroup (SPGroup *group, GSList **children, bool do_done)
// Merging transform
Geom::Affine ctrans;
Geom::Affine const g(gitem->transform);
- if (SP_IS_USE(citem) && sp_use_get_original (SP_USE(citem)) &&
- sp_use_get_original( SP_USE(citem) )->parent == SP_OBJECT(group)) {
+ if (SP_IS_USE(citem) && SP_USE(citem)->get_original() &&
+ SP_USE(citem)->get_original()->parent == SP_OBJECT(group)) {
// make sure a clone's effective transform is the same as was under group
ctrans = g.inverse() * citem->transform * g;
} else {