From b7653ba5421a245957ac6170f0bbca0589220bae Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Mon, 25 May 2009 00:31:41 +0000 Subject: missing null check, would crash blender when loading some files --- source/blender/blenloader/intern/readfile.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'source') diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index d9df1ee4419..3284f8efdf2 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -8116,11 +8116,13 @@ 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 != NULL) { - parent = newlibadr(fd, lib, parent->parent); + if(parent) { + while (parent->parent != NULL) { + parent = newlibadr(fd, lib, parent->parent); + } + if (parent->gameflag & OB_CHILD) + ob->gameflag |= OB_CHILD; } - if (parent->gameflag & OB_CHILD) - ob->gameflag |= OB_CHILD; } } for(wrld=main->world.first; wrld; wrld= wrld->id.next) { -- cgit v1.2.3