summaryrefslogtreecommitdiffstats
path: root/src/widgets/paint-selector.cpp
diff options
context:
space:
mode:
authorMarc Jeanmougin <marc@jeanmougin.fr>2016-05-21 09:58:25 +0000
committerMarc Jeanmougin <marcjeanmougin@free.fr>2016-05-21 09:58:25 +0000
commit9e9ce2c30be9d6af144ff07f69c15c508d84e776 (patch)
tree477b56572c6dbde8fbcd1480c862d3a66b7f232a /src/widgets/paint-selector.cpp
parentAdjust some thresholds for finding intersections in elliptical arcs (diff)
downloadinkscape-9e9ce2c30be9d6af144ff07f69c15c508d84e776.tar.gz
inkscape-9e9ce2c30be9d6af144ff07f69c15c508d84e776.zip
Fix regression: restore order in resources (e.g. pattern list)
(bzr r14907)
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);
}