diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-12-30 06:25:27 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-12-30 06:25:27 +0400 |
| commit | 0d6ae3fda2e5a3dbde941b6985e6895a42c71b9e (patch) | |
| tree | b0c89b9a01da31fffc6b6db7c9395ff2db97de53 /source/blender/blenloader | |
| parent | 19103b443711d7c1b3a24f7fab949f71343d8200 (diff) | |
Main API: refactor naming, use BKE_main_ prefix and add main arg.
Diffstat (limited to 'source/blender/blenloader')
| -rw-r--r-- | source/blender/blenloader/intern/readblenentry.c | 4 | ||||
| -rw-r--r-- | source/blender/blenloader/intern/readfile.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/blenloader/intern/readblenentry.c b/source/blender/blenloader/intern/readblenentry.c index 9ae2858f526..b03d250e868 100644 --- a/source/blender/blenloader/intern/readblenentry.c +++ b/source/blender/blenloader/intern/readblenentry.c @@ -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) { diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index 035a917d37f..ed501d50b07 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -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 */ |