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

Main API: refactor naming, use BKE_main_ prefix and add main arg.

Browse Source
This commit is contained in:
Campbell Barton
2013-12-30 13:25:27 +11:00
parent 19103b4437
commit 0d6ae3fda2
21 changed files with 130 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/blenloader/intern/readblenentry.c
View File

@@ -53,7 +53,7 @@
#include "BKE_main.h"
#include "BKE_library.h" // for free_main
#include "BKE_library.h" // for BKE_main_free
#include "BKE_idcode.h"
#include "BKE_report.h"
@@ -343,7 +343,7 @@ BlendFileData *BLO_read_from_memfile(Main *oldmain, const char *filename, MemFil
void BLO_blendfiledata_free(BlendFileData *bfd)
{
if (bfd->main) {
free_main(bfd->main);
BKE_main_free(bfd->main);
}
if (bfd->user) {

4
source/blender/blenloader/intern/readfile.c
View File

@@ -8946,7 +8946,7 @@ static Main *library_append_begin(Main *mainvar, FileData **fd, const char *file
(*fd)->mainlist = MEM_callocN(sizeof(ListBase), "FileData.mainlist");
/* clear for group instancing tag */
tag_main_lb(&(mainvar->group), 0);
BKE_main_id_tag_listbase(&(mainvar->group), false);
/* make mains */
blo_split_main((*fd)->mainlist, mainvar);
@@ -9026,7 +9026,7 @@ static void library_append_end(const bContext *C, Main *mainl, FileData **fd, in
}
/* clear group instancing tag */
tag_main_lb(&(mainvar->group), 0);
BKE_main_id_tag_listbase(&(mainvar->group), false);
/* has been removed... erm, why? s..ton) */
/* 20040907: looks like they are give base already in append_named_part(); -Nathan L */