Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'source/blender/blenkernel/intern/group.c')
-rw-r--r--source/blender/blenkernel/intern/group.c18
1 files changed, 4 insertions, 14 deletions
diff --git a/source/blender/blenkernel/intern/group.c b/source/blender/blenkernel/intern/group.c
index 68987e21a74..3f68339be11 100644
--- a/source/blender/blenkernel/intern/group.c
+++ b/source/blender/blenkernel/intern/group.c
@@ -60,26 +60,17 @@ static void free_group_object(GroupObject *go)
MEM_freeN(go);
}
-/**
- * Free (or release) any data used by this group (does not free the group itself).
- *
- * \param group The group to free.
- * \param do_id_user When \a true, ID datablocks used (referenced) by this group are 'released'
- * (their user count is decreased).
- */
-/* Note: technically, groupobjects are ID users (without refcount), but for now we can ignore those. */
-void BKE_group_free(Group *group, const bool UNUSED(do_id_user))
+
+void BKE_group_free(Group *group)
{
/* don't free group itself */
GroupObject *go;
- /* No animdata here. */
+ BKE_previewimg_free(&group->preview);
while ((go = BLI_pophead(&group->gobject))) {
free_group_object(go);
}
-
- BKE_previewimg_free(&group->preview);
}
void BKE_group_unlink(Group *group)
@@ -141,8 +132,7 @@ void BKE_group_unlink(Group *group)
}
/* group stays in library, but no members */
- /* XXX This is suspicious, means we keep a dangling, empty group? Also, does not take into account fakeuser? */
- BKE_group_free(group, false);
+ BKE_group_free(group);
group->id.us = 0;
}