diff options
author | Joseph Eagar <joeedh@gmail.com> | 2009-04-11 12:26:51 +0400 |
---|---|---|
committer | Joseph Eagar <joeedh@gmail.com> | 2009-04-11 12:26:51 +0400 |
commit | 59578bfad2b5ab0cd8cb384840ebf17761651851 (patch) | |
tree | 0c21d570c761a6f3d3f81c1efc869498bd7945a1 /source/blender/blenkernel/intern/object.c | |
parent | fc02e980f43074a383b249c7d8118a7132afec47 (diff) |
as per discussion with ton, the editmesh accessors now live
in blenkernel.
Diffstat (limited to 'source/blender/blenkernel/intern/object.c')
-rw-r--r-- | source/blender/blenkernel/intern/object.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c index 7b59a1e6d9c..b913651d856 100644 --- a/source/blender/blenkernel/intern/object.c +++ b/source/blender/blenkernel/intern/object.c @@ -1642,7 +1642,7 @@ static void give_parvert(Object *par, int nr, float *vec) if(par->type==OB_MESH) { Mesh *me= par->data; - em = EM_GetEditMesh(me); + em = BKE_mesh_get_editmesh(me); if(em) { EditVert *eve; @@ -1653,7 +1653,7 @@ static void give_parvert(Object *par, int nr, float *vec) break; } } - EM_EndEditMesh(me, em); + BKE_mesh_end_editmesh(me, em); } else { DerivedMesh *dm = par->derivedFinal; @@ -2296,12 +2296,12 @@ void object_handle_update(Scene *scene, Object *ob) /* includes all keys and modifiers */ if(ob->type==OB_MESH) { - EditMesh *em = EM_GetEditMesh(ob->data); + EditMesh *em = BKE_mesh_get_editmesh(ob->data); // here was vieweditdatamask? XXX if(ob==scene->obedit) { makeDerivedMesh(scene, ob, em, CD_MASK_BAREMESH); - EM_EndEditMesh(ob->data, em); + BKE_mesh_end_editmesh(ob->data, em); } else makeDerivedMesh(scene, ob, NULL, CD_MASK_BAREMESH); } |