浏览代码

Make image-groups map in export.cfg ordered
This improves the VCS experience because otherwise they change their order everytime producing spurious changes.

Pedro J. Estébanez 8 年之前
父节点
当前提交
7576476705
共有 1 个文件被更改,包括 12 次插入4 次删除
  1. 12 4
      tools/editor/editor_import_export.cpp

+ 12 - 4
tools/editor/editor_import_export.cpp

@@ -2092,13 +2092,21 @@ void EditorImportExport::save_config() {
 
 	if (image_groups.size() && image_group_files.size()){
 
-		Vector<String> igfsave;
-		igfsave.resize(image_group_files.size()*2);
+		Vector<String> igfkeys;
+		igfkeys.resize(image_group_files.size());
 		int idx=0;
 		for (Map<StringName,StringName>::Element *E=image_group_files.front();E;E=E->next()) {
+			igfkeys[idx++]=E->key();
+		}
+		igfkeys.sort();
+
+		Vector<String> igfsave;
+		igfsave.resize(image_group_files.size()*2);
+		idx=0;
+		for (int i=0;i<igfkeys.size();++i) {
 
-			igfsave[idx++]=E->key();
-			igfsave[idx++]=E->get();
+			igfsave[idx++]=igfkeys[i];
+			igfsave[idx++]=image_group_files[igfkeys[i]];
 		}
 		cf->set_value("image_group_files","files",igfsave);
 	}