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/blenkernel/intern/blender.c | |
parent | 19103b443711d7c1b3a24f7fab949f71343d8200 (diff) |
Main API: refactor naming, use BKE_main_ prefix and add main arg.
Diffstat (limited to 'source/blender/blenkernel/intern/blender.c')
-rw-r--r-- | source/blender/blenkernel/intern/blender.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/source/blender/blenkernel/intern/blender.c b/source/blender/blenkernel/intern/blender.c index 5b40e3ae68e..5b8eb13a5e7 100644 --- a/source/blender/blenkernel/intern/blender.c +++ b/source/blender/blenkernel/intern/blender.c @@ -113,7 +113,7 @@ char versionstr[48] = ""; void free_blender(void) { /* samples are in a global list..., also sets G.main->sound->sample NULL */ - free_main(G.main); + BKE_main_free(G.main); G.main = NULL; BKE_spacetypes_free(); /* after free main, it uses space callbacks */ @@ -164,7 +164,7 @@ static void clear_global(void) { // extern short winqueue_break; /* screen.c */ - free_main(G.main); /* free all lib data */ + BKE_main_free(G.main); /* free all lib data */ // free_vertexpaint(); @@ -449,7 +449,7 @@ int BKE_read_file(bContext *C, const char *filepath, ReportList *reports) if (bfd->user) retval = BKE_READ_FILE_OK_USERPREFS; if (0 == handle_subversion_warning(bfd->main, reports)) { - free_main(bfd->main); + BKE_main_free(bfd->main); MEM_freeN(bfd); bfd = NULL; retval = BKE_READ_FILE_FAIL; @@ -516,7 +516,7 @@ int BKE_read_file_userdef(const char *filepath, ReportList *reports) U = *bfd->user; MEM_freeN(bfd->user); } - free_main(bfd->main); + BKE_main_free(bfd->main); MEM_freeN(bfd); return retval; @@ -870,10 +870,10 @@ Main *BKE_undo_get_main(Scene **scene) /* assumes data is in G.main */ -void BKE_copybuffer_begin(void) +void BKE_copybuffer_begin(Main *bmain) { /* set all id flags to zero; */ - flag_all_listbases_ids(LIB_NEED_EXPAND | LIB_DOIT, 0); + BKE_main_id_flag_all(bmain, LIB_NEED_EXPAND | LIB_DOIT, false); } void BKE_copybuffer_tag_ID(ID *id) @@ -943,7 +943,7 @@ int BKE_copybuffer_save(const char *filename, ReportList *reports) MEM_freeN(mainb); /* set id flag to zero; */ - flag_all_listbases_ids(LIB_NEED_EXPAND | LIB_DOIT, 0); + BKE_main_id_flag_all(G.main, LIB_NEED_EXPAND | LIB_DOIT, false); if (path_list_backup) { BKE_bpath_list_restore(G.main, path_list_flag, path_list_backup); @@ -974,8 +974,8 @@ int BKE_copybuffer_paste(bContext *C, const char *libname, ReportList *reports) /* tag everything, all untagged data can be made local * its also generally useful to know what is new * - * take extra care flag_all_listbases_ids(LIB_LINK_TAG, 0) is called after! */ - flag_all_listbases_ids(LIB_PRE_EXISTING, 1); + * take extra care BKE_main_id_flag_all(bmain, LIB_LINK_TAG, false) is called after! */ + BKE_main_id_flag_all(bmain, LIB_PRE_EXISTING, true); /* here appending/linking starts */ mainl = BLO_library_append_begin(bmain, &bh, libname); @@ -985,7 +985,7 @@ int BKE_copybuffer_paste(bContext *C, const char *libname, ReportList *reports) BLO_library_append_end(C, mainl, &bh, 0, 0); /* mark all library linked objects to be updated */ - recalc_all_library_objects(bmain); + BKE_main_lib_objects_recalc_all(bmain); IMB_colormanagement_check_file_config(bmain); /* append, rather than linking */ @@ -994,7 +994,7 @@ int BKE_copybuffer_paste(bContext *C, const char *libname, ReportList *reports) /* important we unset, otherwise these object wont * link into other scenes from this blend file */ - flag_all_listbases_ids(LIB_PRE_EXISTING, 0); + BKE_main_id_flag_all(bmain, LIB_PRE_EXISTING, false); /* recreate dependency graph to include new objects */ DAG_relations_tag_update(bmain); |