[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [51644] trunk/blender/source/blender/ blenloader/intern/readfile.c: fix [#26712] Particle group instance ' Use Count' value gets reset on file-load.

[Campbell Barton]

Revision: 51644
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=51644
Author:   campbellbarton
Date:     2012-10-26 05:22:24 +0000 (Fri, 26 Oct 2012)
Log Message:
-----------
fix [#26712] Particle group instance 'Use Count' value gets reset on file-load.

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

Modified: trunk/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/readfile.c	2012-10-26 04:54:55 UTC (rev 51643)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c	2012-10-26 05:22:24 UTC (rev 51644)
@@ -3398,32 +3398,31 @@
 			if (part->dupliweights.first && part->dup_group) {
 				int index_ok = 0;
 				/* check for old files without indices (all indexes 0) */
-				dw = part->dupliweights.first;
 				if (part->dupliweights.first == part->dupliweights.last) {
 					/* special case for only one object in the group */
 					index_ok = 1;
 				}
 				else {
-					for (; dw; dw=dw->next) {
+					for (dw = part->dupliweights.first; dw; dw = dw->next) {
 						if (dw->index > 0) {
 							index_ok = 1;
 							break;
 						}
 					}
 				}
-				
+
 				if (index_ok) {
 					/* if we have indexes, let's use them */
-					dw = part->dupliweights.first;
-					for (; dw; dw=dw->next) {
+					for (dw = part->dupliweights.first; dw; dw = dw->next) {
 						GroupObject *go = (GroupObject *)BLI_findlink(&part->dup_group->gobject, dw->index);
 						dw->ob = go ? go->ob : NULL;
 					}
 				}
 				else {
 					/* otherwise try to get objects from own library (won't work on library linked groups) */
-					for (; dw; dw=dw->next)
+					for (dw = part->dupliweights.first; dw; dw = dw->next) {
 						dw->ob = newlibadr(fd, part->id.lib, dw->ob);
+					}
 				}
 			}
 			else {