From 282e965e030e7a1e9ae3455f877f7e8f8e1ea8dd Mon Sep 17 00:00:00 2001
From: Matthew Petroff <matthew@mpetroff.net>
Date: Tue, 10 Sep 2013 23:50:49 -0400
Subject: Fix document unit change for 3d boxes and (mostly) for text on path.

(bzr r12475.1.12)
---
 src/sp-text.cpp | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'src/sp-text.cpp')

diff --git a/src/sp-text.cpp b/src/sp-text.cpp
index 2e2bf15bc..05a1827fe 100644
--- a/src/sp-text.cpp
+++ b/src/sp-text.cpp
@@ -109,6 +109,8 @@ sp_text_init (SPText *text)
 {
     new (&text->layout) Inkscape::Text::Layout;
     new (&text->attributes) TextTagAttributes;
+    
+    text->_optimizeTextpathText = false;
 }
 
 static void
@@ -427,8 +429,13 @@ sp_text_set_transform (SPItem *item, Geom::Affine const &xform)
     SPText *text = SP_TEXT(item);
 
     // we cannot optimize textpath because changing its fontsize will break its match to the path
-    if (SP_IS_TEXT_TEXTPATH (text))
-        return xform;
+    if (SP_IS_TEXT_TEXTPATH (text)) {
+        if (!text->_optimizeTextpathText) {
+            return xform;
+        } else {
+            text->_optimizeTextpathText = false;
+        }
+    }
 
     /* This function takes care of scaling & translation only, we return whatever parts we can't
        handle. */
-- 
cgit v1.2.3