summaryrefslogtreecommitdiffstats
path: root/src/document.cpp
diff options
context:
space:
mode:
authorJabier Arraiza Cenoz <jabier.arraiza@marker.es>2014-02-23 23:55:35 +0000
committerJabiertxof <jtx@jtx.marker.es>2014-02-23 23:55:35 +0000
commit3188b55dce3d9e82aacb9088622aa762d836d18b (patch)
tree5e2b6a37db48a55bfa6b5f1dd1c4f0874836ea14 /src/document.cpp
parentupdate to trunk (diff)
parentFix for selcue settings. (diff)
downloadinkscape-3188b55dce3d9e82aacb9088622aa762d836d18b.tar.gz
inkscape-3188b55dce3d9e82aacb9088622aa762d836d18b.zip
update to trunk
(bzr r11950.1.255)
Diffstat (limited to 'src/document.cpp')
-rw-r--r--src/document.cpp16
1 files changed, 7 insertions, 9 deletions
diff --git a/src/document.cpp b/src/document.cpp
index 470d0cc5a..112503320 100644
--- a/src/document.cpp
+++ b/src/document.cpp
@@ -1544,15 +1544,13 @@ void SPDocument::importDefs(SPDocument *source)
// Prevent duplicates of solid swatches by checking if equivalent swatch already exists
if (src && SP_IS_GRADIENT(src)) {
SPGradient *gr = SP_GRADIENT(src);
- if (gr->isSolid() || gr->getVector()->isSolid()) {
- for (SPObject *trg = this->getDefs()->firstChild() ; trg ; trg = trg->getNext()) {
- if (trg && SP_IS_GRADIENT(trg) && src != trg) {
- if (gr->isEquivalent(SP_GRADIENT(trg))) {
- // Change object references to the existing equivalent gradient
- change_def_references(src, trg);
- duplicate = true;
- break;
- }
+ for (SPObject *trg = this->getDefs()->firstChild() ; trg ; trg = trg->getNext()) {
+ if (trg && SP_IS_GRADIENT(trg) && src != trg) {
+ if (gr->isEquivalent(SP_GRADIENT(trg))) {
+ // Change object references to the existing equivalent gradient
+ change_def_references(src, trg);
+ duplicate = true;
+ break;
}
}
}