[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [27761] trunk/blender/source/blender/ blenloader/intern/readfile.c: Fix [#21744] cannot open old file 1 1/ 2 year old with 2.49 and 2.5 v670

[Matt Ebb]

Revision: 27761
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=27761
Author:   broken
Date:     2010-03-26 06:55:55 +0100 (Fri, 26 Mar 2010)

Log Message:
-----------
Fix [#21744] cannot open old file 1 1/2 year old with 2.49 and 2.5 v670

Works around a bizarre situation when an object is it's own parent.
Patch by Elia Sarti, thanks!

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	2010-03-26 03:26:17 UTC (rev 27760)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c	2010-03-26 05:55:55 UTC (rev 27761)
@@ -9471,7 +9471,7 @@
 				/* check if top parent has compound shape set and if yes, set this object
 				   to compound shaper as well (was the behaviour before, now it's optional) */
 				Object *parent= newlibadr(fd, lib, ob->parent);
-				while (parent && parent->parent != NULL) {
+				while (parent && parent != ob &&  parent->parent != NULL) {
 					parent = newlibadr(fd, lib, parent->parent);
 				}
 				if(parent) {