summaryrefslogtreecommitdiffstats
path: root/src/sp-string.cpp
diff options
context:
space:
mode:
authorMatthew Petroff <matthew@mpetroff.net>2013-06-25 00:53:34 +0000
committerMatthew Petroff <matthew@mpetroff.net>2013-06-25 00:53:34 +0000
commit08807d307231af4c69dd55794fb6c1bcc1df7b04 (patch)
treef0f44e0fd5b8ca5f6736235cdd098963f5fb08fa /src/sp-string.cpp
parentAdded length class. (diff)
parentCorrectly ignore symbolic link to ltmain.sh (diff)
downloadinkscape-08807d307231af4c69dd55794fb6c1bcc1df7b04.tar.gz
inkscape-08807d307231af4c69dd55794fb6c1bcc1df7b04.zip
Merge from trunk.
(bzr r12380.1.2)
Diffstat (limited to 'src/sp-string.cpp')
-rw-r--r--src/sp-string.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/sp-string.cpp b/src/sp-string.cpp
index 2fe84ac6a..457c248bc 100644
--- a/src/sp-string.cpp
+++ b/src/sp-string.cpp
@@ -132,10 +132,10 @@ sp_string_update(SPObject *object, SPCtx *ctx, unsigned flags)
if (((SPObjectClass *) sp_string_parent_class)->update)
((SPObjectClass *) sp_string_parent_class)->update(object, ctx, flags);
- if (flags & (SP_OBJECT_STYLE_MODIFIED_FLAG | SP_OBJECT_MODIFIED_FLAG)) {
- /* Parent style or we ourselves changed, so recalculate */
- flags &= ~SP_OBJECT_USER_MODIFIED_FLAG_B; // won't be "just a transformation" anymore, we're going to recompute "x" and "y" attributes
- }
+ // if (flags & (SP_OBJECT_STYLE_MODIFIED_FLAG | SP_OBJECT_MODIFIED_FLAG)) {
+ // /* Parent style or we ourselves changed, so recalculate */
+ // flags &= ~SP_OBJECT_USER_MODIFIED_FLAG_B; // won't be "just a transformation" anymore, we're going to recompute "x" and "y" attributes
+ // }
}