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

3 files changed, 12 insertions, 12 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;