summaryrefslogtreecommitdiffstats
path: root/src/object
diff options
context:
space:
mode:
authorMartin Owens <doctormo@gmail.com>2018-09-27 15:57:43 +0000
committerMartin Owens <doctormo@gmail.com>2018-09-27 15:57:43 +0000
commit717a26eb64c59d599cf76444371a4085bfffceb4 (patch)
tree0d4ff1f68111a41c9253664051c571b8f08e8430 /src/object
parentMake attrdialog use the new iconrenderer sigc++ signal (diff)
parentSP_ACTIVE_DESKTOP: check for NULL or eliminate (diff)
downloadinkscape-717a26eb64c59d599cf76444371a4085bfffceb4.tar.gz
inkscape-717a26eb64c59d599cf76444371a4085bfffceb4.zip
Merge branch 'master' of gitlab.com:inkscape/inkscape
Diffstat (limited to 'src/object')
-rw-r--r--src/object/sp-item.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/object/sp-item.cpp b/src/object/sp-item.cpp
index f91310ea5..411e69f71 100644
--- a/src/object/sp-item.cpp
+++ b/src/object/sp-item.cpp
@@ -1628,7 +1628,7 @@ void SPItem::set_i2d_affine(Geom::Affine const &i2dt)
Geom::Affine dt2p; /* desktop to item parent transform */
if (parent) {
dt2p = static_cast<SPItem *>(parent)->i2dt_affine().inverse();
- } else {
+ } else if (SP_ACTIVE_DESKTOP) {
SPDesktop *dt = SP_ACTIVE_DESKTOP;
dt2p = dt->dt2doc();
}