[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [25927] trunk/blender/source/blender: rename free_group to free_group_objects since it doesnt free the group its self .

[Campbell Barton]

Revision: 25927
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=25927
Author:   campbellbarton
Date:     2010-01-12 14:42:13 +0100 (Tue, 12 Jan 2010)

Log Message:
-----------
rename free_group to free_group_objects since it doesnt free the group its self.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/BKE_group.h
    trunk/blender/source/blender/blenkernel/intern/group.c
    trunk/blender/source/blender/blenkernel/intern/library.c
    trunk/blender/source/blender/makesrna/intern/rna_main_api.c

Modified: trunk/blender/source/blender/blenkernel/BKE_group.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_group.h	2010-01-12 13:40:29 UTC (rev 25926)
+++ trunk/blender/source/blender/blenkernel/BKE_group.h	2010-01-12 13:42:13 UTC (rev 25927)
@@ -37,8 +37,7 @@
 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);

Modified: trunk/blender/source/blender/blenkernel/intern/group.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/group.c	2010-01-12 13:40:29 UTC (rev 25926)
+++ trunk/blender/source/blender/blenkernel/intern/group.c	2010-01-12 13:42:13 UTC (rev 25927)
@@ -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 @@
 	}
 	
 	/* group stays in library, but no members */
-	free_group(group);
+	free_group_objects(group);
 	group->id.us= 0;
 }
 

Modified: trunk/blender/source/blender/blenkernel/intern/library.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/library.c	2010-01-12 13:40:29 UTC (rev 25926)
+++ trunk/blender/source/blender/blenkernel/intern/library.c	2010-01-12 13:42:13 UTC (rev 25927)
@@ -768,7 +768,7 @@
 			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);

Modified: trunk/blender/source/blender/makesrna/intern/rna_main_api.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_main_api.c	2010-01-12 13:40:29 UTC (rev 25926)
+++ trunk/blender/source/blender/makesrna/intern/rna_main_api.c	2010-01-12 13:42:13 UTC (rev 25927)
@@ -188,7 +188,6 @@
 }
 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);