rename free_group to free_group_objects since it doesnt free the group its self.
This commit is contained in:
@@ -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);
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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);
|
||||
|
||||
Reference in New Issue
Block a user