diff options
| author | Jabier Arraiza Cenoz <jabier.arraiza@marker.es> | 2016-10-14 20:24:55 +0000 |
|---|---|---|
| committer | jabiertxof <info@marker.es> | 2016-10-14 20:24:55 +0000 |
| commit | 40cd3380a76c79cd09733ae01053750cf731b674 (patch) | |
| tree | bd33ff51aa43b539a56d339776986aa28835ccab /src/sp-gradient.cpp | |
| parent | Working with rotate widget (diff) | |
| parent | Implement copying of objects with mesh gradients. (diff) | |
| download | inkscape-40cd3380a76c79cd09733ae01053750cf731b674.tar.gz inkscape-40cd3380a76c79cd09733ae01053750cf731b674.zip | |
Update to trunk
(bzr r15142.1.12)
Diffstat (limited to 'src/sp-gradient.cpp')
| -rw-r--r-- | src/sp-gradient.cpp | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/src/sp-gradient.cpp b/src/sp-gradient.cpp index 333316697..49f117a51 100644 --- a/src/sp-gradient.cpp +++ b/src/sp-gradient.cpp @@ -1144,15 +1144,17 @@ sp_gradient_pattern_common_setup(cairo_pattern_t *cp, } // add stops - for (std::vector<SPGradientStop>::iterator i = gr->vector.stops.begin(); - i != gr->vector.stops.end(); ++i) - { - // multiply stop opacity by paint opacity - cairo_pattern_add_color_stop_rgba(cp, i->offset, - i->color.v.c[0], i->color.v.c[1], i->color.v.c[2], i->opacity * opacity); + if (!SP_IS_MESHGRADIENT(gr)) { + for (std::vector<SPGradientStop>::iterator i = gr->vector.stops.begin(); + i != gr->vector.stops.end(); ++i) + { + // multiply stop opacity by paint opacity + cairo_pattern_add_color_stop_rgba(cp, i->offset, + i->color.v.c[0], i->color.v.c[1], i->color.v.c[2], i->opacity * opacity); + } } - // set pattern matrix + // set pattern transform matrix Geom::Affine gs2user = gr->gradientTransform; if (gr->getUnits() == SP_GRADIENT_UNITS_OBJECTBOUNDINGBOX && bbox) { Geom::Affine bbox2user(bbox->width(), 0, 0, bbox->height(), bbox->left(), bbox->top()); |