summaryrefslogtreecommitdiffstats
path: root/src/widgets/paint-selector.cpp
diff options
context:
space:
mode:
authorJabier Arraiza Cenoz <jabier.arraiza@marker.es>2016-05-21 22:13:06 +0000
committerjabiertxof <info@marker.es>2016-05-21 22:13:06 +0000
commiteef0bdfef0bdbaa00c17067c601061d905974096 (patch)
tree737c7efb116ec01e23e8d21ae9f9acc92923c708 /src/widgets/paint-selector.cpp
parentFixing undo thing (diff)
parentRemove duplicated code (diff)
downloadinkscape-eef0bdfef0bdbaa00c17067c601061d905974096.tar.gz
inkscape-eef0bdfef0bdbaa00c17067c601061d905974096.zip
update to trunk
(bzr r14865.1.6)
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);
}