diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2010-01-12 16:42:13 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2010-01-12 16:42:13 +0300 |
| commit | 78798ba4df75d3a17b9c8ea27176384d66a96ae6 (patch) | |
| tree | 8e31c87384cc134ec0293821bf169bb25a65f7f7 | |
| parent | 70942f9a8321e27d5c7dc2036301989364f9a5aa (diff) | |
rename free_group to free_group_objects since it doesnt free the group its self.
| -rw-r--r-- | source/blender/blenkernel/BKE_group.h | 3 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/group.c | 6 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/library.c | 2 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_main_api.c | 1 |
4 files changed, 5 insertions, 7 deletions
diff --git a/source/blender/blenkernel/BKE_group.h b/source/blender/blenkernel/BKE_group.h index 877e09b037f..1a194cf2cfa 100644 --- a/source/blender/blenkernel/BKE_group.h +++ b/source/blender/blenkernel/BKE_group.h @@ -37,8 +37,7 @@ struct Object; struct bAction; struct Scene; -void free_group_object(struct GroupObject *go); -void free_group(struct Group *group); +void free_group_objects(struct Group *group); void unlink_group(struct Group *group); struct Group *add_group(char *name); struct Group *copy_group(struct Group *group); diff --git a/source/blender/blenkernel/intern/group.c b/source/blender/blenkernel/intern/group.c index f35a0a96bb4..9a690729d3e 100644 --- a/source/blender/blenkernel/intern/group.c +++ b/source/blender/blenkernel/intern/group.c @@ -57,13 +57,13 @@ #include <config.h> #endif -void free_group_object(GroupObject *go) +static void free_group_object(GroupObject *go) { MEM_freeN(go); } -void free_group(Group *group) +void free_group_objects(Group *group) { /* don't free group itself */ GroupObject *go; @@ -130,7 +130,7 @@ void unlink_group(Group *group) } /* group stays in library, but no members */ - free_group(group); + free_group_objects(group); group->id.us= 0; } diff --git a/source/blender/blenkernel/intern/library.c b/source/blender/blenkernel/intern/library.c index ae3d201a918..4b6257b8b18 100644 --- a/source/blender/blenkernel/intern/library.c +++ b/source/blender/blenkernel/intern/library.c @@ -768,7 +768,7 @@ void free_libblock(ListBase *lb, void *idv) sound_free((bSound*)id); break; case ID_GR: - free_group((Group *)id); + free_group_objects((Group *)id); break; case ID_AR: free_armature((bArmature *)id); diff --git a/source/blender/makesrna/intern/rna_main_api.c b/source/blender/makesrna/intern/rna_main_api.c index a1cc8bbabc8..fdb192055b3 100644 --- a/source/blender/makesrna/intern/rna_main_api.c +++ b/source/blender/makesrna/intern/rna_main_api.c @@ -188,7 +188,6 @@ Group *rna_Main_groups_new(Main *bmain, char* name) } void rna_Main_groups_remove(Main *bmain, ReportList *reports, Group *group) { - free_group(group); unlink_group(group); group->id.us= 0; free_libblock(&bmain->group, group); |