archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Library API: pass Main struct to unlink functions

Browse Source
This commit is contained in:
Campbell Barton
2015-11-02 21:20:03 +11:00
parent 56bcda8bc6
commit 7a9693fa8b
8 changed files with 20 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/makesrna/intern/rna_main_api.c
View File

@@ -226,7 +226,7 @@ static void rna_Main_objects_remove(Main *bmain, ReportList *reports, PointerRNA
{
Object *object = object_ptr->data;
if (ID_REAL_USERS(object) <= 0) {
BKE_object_unlink(object); /* needed or ID pointers to this are not cleared */
BKE_object_unlink(bmain, object); /* needed or ID pointers to this are not cleared */
BKE_libblock_free(bmain, object);
RNA_POINTER_INVALIDATE(object_ptr);
}
@@ -539,7 +539,7 @@ static Group *rna_Main_groups_new(Main *bmain, const char *name)
static void rna_Main_groups_remove(Main *bmain, PointerRNA *group_ptr)
{
Group *group = group_ptr->data;
BKE_group_unlink(group);
BKE_group_unlink(bmain, group);
BKE_libblock_free(bmain, group);
RNA_POINTER_INVALIDATE(group_ptr);
}