summaryrefslogtreecommitdiffstats
path: root/src/gradient-chemistry.cpp
diff options
context:
space:
mode:
authorShlomi Fish <shlomif@shlomifish.org>2016-10-08 15:39:06 +0000
committerShlomi Fish <shlomif@shlomifish.org>2016-10-08 15:39:06 +0000
commit2a5534a166dff8bfe6b56c8a3b496e989280fbd1 (patch)
treedbd8330a6b3dcfb201ee751dbf283a17a41a2dfa /src/gradient-chemistry.cpp
parentMerged. (diff)
parent[Bug #770681] KEY MAPPING: Comma and period hijacked by scaling. (diff)
downloadinkscape-2a5534a166dff8bfe6b56c8a3b496e989280fbd1.tar.gz
inkscape-2a5534a166dff8bfe6b56c8a3b496e989280fbd1.zip
Merged.
(bzr r15100.1.31)
Diffstat (limited to 'src/gradient-chemistry.cpp')
-rw-r--r--src/gradient-chemistry.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/gradient-chemistry.cpp b/src/gradient-chemistry.cpp
index 061fadbaa..cf5cda180 100644
--- a/src/gradient-chemistry.cpp
+++ b/src/gradient-chemistry.cpp
@@ -434,6 +434,11 @@ SPGradient *sp_gradient_convert_to_userspace(SPGradient *gr, SPItem *item, gchar
return gr;
}
+ // FIXME Transforming a mesh gradient is more complicated... probably need to add function to SPMeshArray.wq
+ if ( gr && SP_IS_MESHGRADIENT( gr ) ) {
+ return gr;
+ }
+
// First, fork it if it is shared
gr = sp_gradient_fork_private_if_necessary(gr, gr->getVector(),
SP_IS_RADIALGRADIENT(gr) ? SP_GRADIENT_TYPE_RADIAL : SP_GRADIENT_TYPE_LINEAR, item);