diff options
| author | Matt Ebb <matt@mke3.net> | 2010-03-26 08:55:55 +0300 |
|---|---|---|
| committer | Matt Ebb <matt@mke3.net> | 2010-03-26 08:55:55 +0300 |
| commit | 50a49f2e0a1fae39cdd88e6c17fd2d5d2d3711d3 (patch) | |
| tree | 8023cecf7c3030b37ecf4fba58b1da0e53a4c927 /source/blender/blenloader | |
| parent | c60f291b647f8d8f5942389718bf6312781a1e34 (diff) | |
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!
Diffstat (limited to 'source/blender/blenloader')
| -rw-r--r-- | source/blender/blenloader/intern/readfile.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index 58443a73b96..19bb72a2d82 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -9471,7 +9471,7 @@ static void do_versions(FileData *fd, Library *lib, Main *main) /* 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) { |