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/editors | |
parent | 19103b443711d7c1b3a24f7fab949f71343d8200 (diff) |
Main API: refactor naming, use BKE_main_ prefix and add main arg.
Diffstat (limited to 'source/blender/editors')
-rw-r--r-- | source/blender/editors/object/object_add.c | 12 | ||||
-rw-r--r-- | source/blender/editors/object/object_group.c | 4 | ||||
-rw-r--r-- | source/blender/editors/object/object_relations.c | 8 | ||||
-rw-r--r-- | source/blender/editors/render/render_internal.c | 2 | ||||
-rw-r--r-- | source/blender/editors/render/render_preview.c | 4 | ||||
-rw-r--r-- | source/blender/editors/space_view3d/view3d_ops.c | 3 |
6 files changed, 17 insertions, 16 deletions
diff --git a/source/blender/editors/object/object_add.c b/source/blender/editors/object/object_add.c index 669d762029a..486e278c00c 100644 --- a/source/blender/editors/object/object_add.c +++ b/source/blender/editors/object/object_add.c @@ -1093,7 +1093,7 @@ static int object_delete_exec(bContext *C, wmOperator *op) return OPERATOR_CANCELLED; /* delete has to handle all open scenes */ - flag_listbase_ids(&bmain->scene, LIB_DOIT, 1); + BKE_main_id_flag_listbase(&bmain->scene, LIB_DOIT, 1); for (win = wm->windows.first; win; win = win->next) { scene = win->screen->scene; @@ -1216,7 +1216,7 @@ static void copy_object_set_idnew(bContext *C, int dupflag) set_sca_new_poins(); - clear_id_newpoins(); + BKE_main_id_clear_newpoins(bmain); } /********************* Make Duplicates Real ************************/ @@ -1369,7 +1369,7 @@ static int object_duplicates_make_real_exec(bContext *C, wmOperator *op) const short use_base_parent = RNA_boolean_get(op->ptr, "use_base_parent"); const short use_hierarchy = RNA_boolean_get(op->ptr, "use_hierarchy"); - clear_id_newpoins(); + BKE_main_id_clear_newpoins(bmain); CTX_DATA_BEGIN (C, Base *, base, selected_editable_bases) { @@ -2029,7 +2029,7 @@ Base *ED_object_add_duplicate(Main *bmain, Scene *scene, Base *base, int dupflag Base *basen; Object *ob; - clear_id_newpoins(); + BKE_main_id_clear_newpoins(bmain); clear_sca_new_poins(); /* sensor/contr/act */ basen = object_add_duplicate_internal(bmain, scene, base, dupflag); @@ -2060,7 +2060,7 @@ static int duplicate_exec(bContext *C, wmOperator *op) int linked = RNA_boolean_get(op->ptr, "linked"); int dupflag = (linked) ? 0 : U.dupflag; - clear_id_newpoins(); + BKE_main_id_clear_newpoins(bmain); clear_sca_new_poins(); /* sensor/contr/act */ CTX_DATA_BEGIN (C, Base *, base, selected_bases) @@ -2141,7 +2141,7 @@ static int add_named_exec(bContext *C, wmOperator *op) base->flag = ob->flag; /* prepare dupli */ - clear_id_newpoins(); + BKE_main_id_clear_newpoins(bmain); clear_sca_new_poins(); /* sensor/contr/act */ basen = object_add_duplicate_internal(bmain, scene, base, dupflag); diff --git a/source/blender/editors/object/object_group.c b/source/blender/editors/object/object_group.c index 7e0bd2a4da7..2f27b45c055 100644 --- a/source/blender/editors/object/object_group.c +++ b/source/blender/editors/object/object_group.c @@ -188,7 +188,7 @@ static int objects_add_active_exec(bContext *C, wmOperator *op) continue; /* for recursive check */ - tag_main_lb(&bmain->group, TRUE); + BKE_main_id_tag_listbase(&bmain->group, true); CTX_DATA_BEGIN (C, Base *, base, selected_editable_bases) { @@ -494,7 +494,7 @@ static int group_link_exec(bContext *C, wmOperator *op) * It is also bad idea to add object to group which is in group which * contains our current object. */ - tag_main_lb(&bmain->group, TRUE); + BKE_main_id_tag_listbase(&bmain->group, true); if (ob->dup_group == group || check_group_contains_object_recursive(group, ob)) { BKE_report(op->reports, RPT_ERROR, "Could not add the group because of dependency cycle detected"); return OPERATOR_CANCELLED; diff --git a/source/blender/editors/object/object_relations.c b/source/blender/editors/object/object_relations.c index b3a2a7b6e0b..6d33ba673f3 100644 --- a/source/blender/editors/object/object_relations.c +++ b/source/blender/editors/object/object_relations.c @@ -2050,7 +2050,7 @@ void ED_object_single_users(Main *bmain, Scene *scene, bool full, bool copy_grou single_tex_users_expand(bmain); } - clear_id_newpoins(); + BKE_main_id_clear_newpoins(bmain); } /******************************* Make Local ***********************************/ @@ -2096,7 +2096,7 @@ static int make_local_exec(bContext *C, wmOperator *op) return OPERATOR_FINISHED; } - clear_id_newpoins(); + BKE_main_id_clear_newpoins(bmain); CTX_DATA_BEGIN (C, Object *, ob, selected_objects) { @@ -2212,7 +2212,7 @@ static int make_single_user_exec(bContext *C, wmOperator *op) int flag = RNA_enum_get(op->ptr, "type"); /* 0==ALL, SELECTED==selected objecs */ bool copy_groups = false; - clear_id_newpoins(); + BKE_main_id_clear_newpoins(bmain); if (RNA_boolean_get(op->ptr, "object")) single_object_users(bmain, scene, v3d, flag, copy_groups); @@ -2235,7 +2235,7 @@ static int make_single_user_exec(bContext *C, wmOperator *op) * Need to make sure all the guys are learing newid before they're * using it, not after. */ - clear_id_newpoins(); + BKE_main_id_clear_newpoins(bmain); WM_event_add_notifier(C, NC_WINDOW, NULL); return OPERATOR_FINISHED; diff --git a/source/blender/editors/render/render_internal.c b/source/blender/editors/render/render_internal.c index 091dc11f500..b4414cf3f54 100644 --- a/source/blender/editors/render/render_internal.c +++ b/source/blender/editors/render/render_internal.c @@ -578,7 +578,7 @@ static void render_endjob(void *rjv) RE_InitRenderCB(rj->re); if (rj->main != G.main) - free_main(rj->main); + BKE_main_free(rj->main); /* else the frame will not update for the original value */ if (rj->anim && !(rj->scene->r.scemode & R_NO_FRAME_UPDATE)) { diff --git a/source/blender/editors/render/render_preview.c b/source/blender/editors/render/render_preview.c index 99f86371eb3..3f507cd5020 100644 --- a/source/blender/editors/render/render_preview.c +++ b/source/blender/editors/render/render_preview.c @@ -221,10 +221,10 @@ void ED_preview_init_dbase(void) void ED_preview_free_dbase(void) { if (G_pr_main) - free_main(G_pr_main); + BKE_main_free(G_pr_main); if (G_pr_main_cycles) - free_main(G_pr_main_cycles); + BKE_main_free(G_pr_main_cycles); } static int preview_mat_has_sss(Material *mat, bNodeTree *ntree) diff --git a/source/blender/editors/space_view3d/view3d_ops.c b/source/blender/editors/space_view3d/view3d_ops.c index 12405150267..1c471aee8ca 100644 --- a/source/blender/editors/space_view3d/view3d_ops.c +++ b/source/blender/editors/space_view3d/view3d_ops.c @@ -62,9 +62,10 @@ static int view3d_copybuffer_exec(bContext *C, wmOperator *op) { + Main *bmain = CTX_data_main(C); char str[FILE_MAX]; - BKE_copybuffer_begin(); + BKE_copybuffer_begin(bmain); /* context, selection, could be generalized */ CTX_DATA_BEGIN (C, Object *, ob, selected_objects) |