diff options
author | Campbell Barton <ideasman42@gmail.com> | 2009-12-07 22:49:14 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2009-12-07 22:49:14 +0300 |
commit | 987e9bc1724602fe6dab35662afa54df26d07cf4 (patch) | |
tree | d79aca293be7a1b3e4b8dd88e2b1a2cbe35ec58b /source | |
parent | fc69c54c4ce810e6236eaa45017130f27ba3f1e2 (diff) |
missing null check from recent changes
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/blenkernel/intern/group.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/group.c b/source/blender/blenkernel/intern/group.c index 3ab02a576d0..f35a0a96bb4 100644 --- a/source/blender/blenkernel/intern/group.c +++ b/source/blender/blenkernel/intern/group.c @@ -217,8 +217,8 @@ static int rem_from_group_internal(Group *group, Object *ob) int rem_from_group(Group *group, Object *object, Scene *scene, Base *base) { if(rem_from_group_internal(group, object)) { - - if(find_group(object, NULL) == NULL) { + /* object can be NULL */ + if(object && find_group(object, NULL) == NULL) { if(scene && base==NULL) base= object_in_scene(object, scene); |