Undo revision 23130 which was a merge with 2.5, a messy one because I did something wrong (`svn status` output: http://www.pasteall.org/7887).soc-2009-kazanbas

The command: svn merge -r 23130:23129 https://svn.blender.org/svnroot/bf-blender/branches/soc-2009-kazanbas

1 files changed, 4 insertions, 4 deletions

diff --git a/source/blender/makesrna/intern/rna_object_api.c b/source/blender/makesrna/intern/rna_object_api.c
index 968aa971f73..3c79c1cbc21 100644
--- a/source/blender/makesrna/intern/rna_object_api.c
+++ b/source/blender/makesrna/intern/rna_object_api.c
@@ -282,18 +282,18 @@ static void rna_Object_convert_to_triface(Object *ob, bContext *C, ReportList *r
 	if (!ob_editing)
 		free_editMesh(me->edit_mesh);
 
-	DAG_id_flush_update(ob, OB_RECALC_DATA);
+	DAG_object_flush_update(sce, ob, OB_RECALC_DATA);
 }
 
 static bDeformGroup *rna_Object_add_vertex_group(Object *ob, char *group_name)
 {
-	return ED_vgroup_add_name(ob, group_name);
+	return add_defgroup_name(ob, group_name);
 }
 
 static void rna_Object_add_vertex_to_group(Object *ob, int vertex_index, bDeformGroup *def, float weight, int assignmode)
 {
 	/* creates dverts if needed */
-	ED_vgroup_vert_add(ob, def, vertex_index, weight, assignmode);
+	add_vert_to_defgroup(ob, def, vertex_index, weight, assignmode);
 }
 
 /* copied from old API Object.makeDisplayList (Object.c) */
@@ -307,7 +307,7 @@ static void rna_Object_make_display_list(Object *ob, bContext *C)
 		BKE_text_to_curve(sce, ob, CU_LEFT);
 	}
 
-	DAG_id_flush_update(ob, OB_RECALC_DATA);
+	DAG_object_flush_update(sce, ob, OB_RECALC_DATA);
 }
 
 static Object *rna_Object_find_armature(Object *ob)