rename free_group to free_group_objects since it doesnt free the group its self.
authorCampbell Barton <ideasman42@gmail.com>
Tue, 12 Jan 2010 13:42:13 +0000 (13:42 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 12 Jan 2010 13:42:13 +0000 (13:42 +0000)
source/blender/blenkernel/BKE_group.h
source/blender/blenkernel/intern/group.c
source/blender/blenkernel/intern/library.c
source/blender/makesrna/intern/rna_main_api.c

index 877e09b037fbbe4c762523bf0d3715e2f0b03823..1a194cf2cfa9c5a2d331854d4f1d42542a19c173 100644 (file)
@@ -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);
index f35a0a96bb4c5e8d9b2a0c9108dbacdbdd21615a..9a690729d3eb959a81e2bc174c20c103a9a8eda4 100644 (file)
 #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;
 }
 
index ae3d201a91888e38f1d8190ad151299111cb7f61..4b6257b8b188ae2a851fb1c3225820ea79dffc70 100644 (file)
@@ -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);
index a1cc8bbabc803d78db0fab273d5a84fcd29e53c6..fdb192055b3ce8f8f93db3a00848f2bc4f7b84c0 100644 (file)
@@ -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);