From 757647670501833c4f550a224b5da51d39fb6b9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20J=2E=20Est=C3=A9banez?= Date: Mon, 16 Jan 2017 19:00:48 +0100 Subject: [PATCH] Make image-groups map in export.cfg ordered This improves the VCS experience because otherwise they change their order everytime producing spurious changes. --- tools/editor/editor_import_export.cpp | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/tools/editor/editor_import_export.cpp b/tools/editor/editor_import_export.cpp index d90a175811..b52390fe9e 100644 --- a/tools/editor/editor_import_export.cpp +++ b/tools/editor/editor_import_export.cpp @@ -2092,13 +2092,21 @@ void EditorImportExport::save_config() { if (image_groups.size() && image_group_files.size()){ - Vector igfsave; - igfsave.resize(image_group_files.size()*2); + Vector igfkeys; + igfkeys.resize(image_group_files.size()); int idx=0; for (Map::Element *E=image_group_files.front();E;E=E->next()) { + igfkeys[idx++]=E->key(); + } + igfkeys.sort(); - igfsave[idx++]=E->key(); - igfsave[idx++]=E->get(); + Vector igfsave; + igfsave.resize(image_group_files.size()*2); + idx=0; + for (int i=0;iset_value("image_group_files","files",igfsave); }