[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [28495] branches/render25/source/blender/ blenloader/intern/readfile.c: enforce modifier name uniqueness on file load

[Joseph Eagar]

Revision: 28495
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=28495
Author:   joeedh
Date:     2010-04-28 19:41:01 +0200 (Wed, 28 Apr 2010)

Log Message:
-----------
enforce modifier name uniqueness on file load

Modified Paths:
--------------
    branches/render25/source/blender/blenloader/intern/readfile.c

Modified: branches/render25/source/blender/blenloader/intern/readfile.c
===================================================================
--- branches/render25/source/blender/blenloader/intern/readfile.c	2010-04-28 16:11:18 UTC (rev 28494)
+++ branches/render25/source/blender/blenloader/intern/readfile.c	2010-04-28 17:41:01 UTC (rev 28495)
@@ -3403,8 +3403,22 @@
 	if(*idpoin && GS((*idpoin)->name)!=ID_OB)
 		(*idpoin)->us++;
 }
+
 static void lib_link_modifiers(FileData *fd, Object *ob)
 {
+	/*ensure unique modifier names*/
+	ModifierData *md, *md2;
+
+	for (md=ob->modifiers.first; md; md=md->next) {
+		for (md2=ob->modifiers.first; md2; md2=md2->next) {
+			if (md == md2) continue;
+
+			if (!strcmp(md->name, md2->name)) {
+				modifier_unique_name(&ob->modifiers, md2);
+			}
+		}
+	}
+
 	modifiers_foreachIDLink(ob, lib_link_modifiers__linkModifiers, fd);
 }