summaryrefslogtreecommitdiffstats
path: root/src/widgets/paint-selector.cpp
diff options
context:
space:
mode:
authorJabier Arraiza Cenoz <jabier.arraiza@marker.es>2016-05-21 21:07:01 +0000
committerjabiertxof <info@marker.es>2016-05-21 21:07:01 +0000
commit0c4ff843cb6263af471cd0b95ebb3a930b8a000e (patch)
tree36559957dab0432bf071f45a0449ccb70167a2cc /src/widgets/paint-selector.cpp
parentUpdate to refresh knots (diff)
parentRemove duplicated code (diff)
downloadinkscape-0c4ff843cb6263af471cd0b95ebb3a930b8a000e.tar.gz
inkscape-0c4ff843cb6263af471cd0b95ebb3a930b8a000e.zip
update to trunk
(bzr r13645.1.140)
Diffstat (limited to 'src/widgets/paint-selector.cpp')
-rw-r--r--src/widgets/paint-selector.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/widgets/paint-selector.cpp b/src/widgets/paint-selector.cpp
index 602cad3c3..aafa6bd1e 100644
--- a/src/widgets/paint-selector.cpp
+++ b/src/widgets/paint-selector.cpp
@@ -844,8 +844,8 @@ ink_pattern_list_get (SPDocument *source)
return NULL;
GSList *pl = NULL;
- std::set<SPObject *> patterns = source->getResourceList("pattern");
- for (std::set<SPObject *>::const_iterator it = patterns.begin(); it != patterns.end(); ++it) {
+ std::vector<SPObject *> patterns = source->getResourceList("pattern");
+ for (std::vector<SPObject *>::const_iterator it = patterns.begin(); it != patterns.end(); ++it) {
if (SP_PATTERN(*it) == SP_PATTERN(*it)->rootPattern()) { // only if this is a root pattern
pl = g_slist_prepend(pl, *it);
}