summaryrefslogtreecommitdiffstats
path: root/src/id-clash.cpp
diff options
context:
space:
mode:
authorRaphael Rosch <launchpad@insaner.com>2014-03-12 18:34:51 +0000
committerinsaner <launchpad@insaner.com>2014-03-12 18:34:51 +0000
commit76be008fcda64acffe569af78f77a07b0d4ea593 (patch)
tree9b0d89072acc9c36b3c5ed41dd797e4df4c63bfb /src/id-clash.cpp
parentUse NEAREST filter when transforming cache (diff)
downloadinkscape-76be008fcda64acffe569af78f77a07b0d4ea593.tar.gz
inkscape-76be008fcda64acffe569af78f77a07b0d4ea593.zip
incorrect gradient transform on copy&paste.. committing for mathog
Fixed bugs: - https://launchpad.net/bugs/1283193 (bzr r13139)
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;
}
}
}