From 5927b3bf5d9d8dcc9f519b4b9060669bd2599a28 Mon Sep 17 00:00:00 2001
From: Jabiertxof <jtx@jtx>
Date: Fri, 16 Dec 2016 23:49:53 +0100
Subject: Rollback 15315

(bzr r15295.1.25)
---
 src/sp-item-group.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'src/sp-item-group.cpp')

diff --git a/src/sp-item-group.cpp b/src/sp-item-group.cpp
index 7b2507b5e..96dcdbe30 100644
--- a/src/sp-item-group.cpp
+++ b/src/sp-item-group.cpp
@@ -584,13 +584,12 @@ sp_item_group_ungroup (SPGroup *group, std::vector<SPItem*> &children, bool do_d
             SPText * text = dynamic_cast<SPText *>(citem);
             if (text) {
                 //this causes a change in text-on-path appearance when there is a non-conformal transform, see bug #1594565
+                double scale = (ctrans.expansionX() + ctrans.expansionY()) / 2.0;
                 SPTextPath * text_path = dynamic_cast<SPTextPath *>(text->firstChild());
                 if (!text_path) {
                     nrepr->setAttribute("transform", affinestr);
                 } else {
-                    // The following breaks roundtripping  group -> ungroup
-                    // double scale = (ctrans.expansionX() + ctrans.expansionY()) / 2.0;
-                    // sp_recursive_scale_text_size(nrepr, scale);
+                    sp_recursive_scale_text_size(nrepr, scale);
                     Geom::Affine ttrans = ctrans.inverse() * SP_ITEM(text)->transform * ctrans;
                     gchar *affinestr = sp_svg_transform_write(ttrans);
                     nrepr->setAttribute("transform", affinestr);
-- 
cgit v1.2.3