diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-03-01 01:35:49 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-03-01 01:35:49 +0400 |
| commit | 35708fe15044445fead8bc7c3709edea6921cff5 (patch) | |
| tree | 835087aae42cd973e4a51895e60e206434c0e0fe /source/blender/blenkernel/intern/group.c | |
| parent | a20ca0ca32087b97c76819be88091b7caf4da85c (diff) | |
| parent | af0a469307d5abe30d59c62c61d8bbc361bdf359 (diff) | |
Merged changes in the trunk up to revision 44561.
Conflicts resolved:
source/blender/bmesh/bmesh.h
source/blender/bmesh/bmesh_operators.h
source/blenderplayer/bad_level_call_stubs/stubs.c
Diffstat (limited to 'source/blender/blenkernel/intern/group.c')
| -rw-r--r-- | source/blender/blenkernel/intern/group.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/group.c b/source/blender/blenkernel/intern/group.c index 8ebac31ad95..989ccf65a88 100644 --- a/source/blender/blenkernel/intern/group.c +++ b/source/blender/blenkernel/intern/group.c @@ -129,7 +129,7 @@ void unlink_group(Group *group) #endif } - for(psys=ob->particlesystem.first; psys; psys=psys->next){ + for(psys=ob->particlesystem.first; psys; psys=psys->next) { if(psys->part->dup_group==group) psys->part->dup_group= NULL; #if 0 /* not used anymore, only keps for readfile.c, no need to account for this */ |