summaryrefslogtreecommitdiffstats
path: root/src/id-clash.cpp
diff options
context:
space:
mode:
authorJabier Arraiza Cenoz <jabier.arraiza@marker.es>2014-03-12 20:15:38 +0000
committerJabiertxof <jtx@jtx.marker.es>2014-03-12 20:15:38 +0000
commit3697b9ed4fa85fc4deb9a9069dc7397fbedc2003 (patch)
treeb1e8aa49ce94542b41231eb36c6e804ec2b3e08c /src/id-clash.cpp
parentupdate to trunk (diff)
parentincorrect gradient transform on copy&paste.. committing for mathog (diff)
downloadinkscape-3697b9ed4fa85fc4deb9a9069dc7397fbedc2003.tar.gz
inkscape-3697b9ed4fa85fc4deb9a9069dc7397fbedc2003.zip
update to trunk
(bzr r11950.1.291)
Diffstat (limited to 'src/id-clash.cpp')
-rw-r--r--src/id-clash.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/id-clash.cpp b/src/id-clash.cpp
index 76b8e6ff8..f59b3b920 100644
--- a/src/id-clash.cpp
+++ b/src/id-clash.cpp
@@ -215,9 +215,10 @@ change_clashing_ids(SPDocument *imported_doc, SPDocument *current_doc,
SPObject *cd_obj = current_doc->getObjectById(id);
if (cd_obj && SP_IS_GRADIENT(cd_obj)) {
- SPGradient *cd_gr = SP_GRADIENT(cd_obj);
- if (cd_gr->isEquivalent(SP_GRADIENT(elem))) {
- fix_clashing_ids = false;
+ SPGradient *cd_gr = SP_GRADIENT(cd_obj);
+ if ( cd_gr->isEquivalent(SP_GRADIENT(elem)) &&
+ cd_gr->isAligned(SP_GRADIENT(elem))) {
+ fix_clashing_ids = false;
}
}
}