From 37e73aa368d7f3cd855fab0812673b484ee4f4e9 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 16 Apr 2013 05:59:48 +0000 Subject: code cleanup: use BKE naming conventions for functions in BKE_editmesh.h and BKE_editmesh_bvh.h --- source/blender/blenkernel/intern/object.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source/blender/blenkernel/intern/object.c') diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c index 91845178a04..538cead5d5b 100644 --- a/source/blender/blenkernel/intern/object.c +++ b/source/blender/blenkernel/intern/object.c @@ -2716,7 +2716,7 @@ void BKE_object_handle_update_ex(Scene *scene, Object *ob, case OB_MESH: { #if 0 // XXX, comment for 2.56a release, background wont set 'scene->customdata_mask' - BMEditMesh *em = (ob == scene->obedit) ? BMEdit_FromObject(ob) : NULL; + BMEditMesh *em = (ob == scene->obedit) ? BKE_editmesh_from_object(ob) : NULL; BLI_assert((scene->customdata_mask & CD_MASK_BAREMESH) == CD_MASK_BAREMESH); if (em) { makeDerivedMesh(scene, ob, em, scene->customdata_mask, 0); /* was CD_MASK_BAREMESH */ @@ -2726,7 +2726,7 @@ void BKE_object_handle_update_ex(Scene *scene, Object *ob, } #else /* ensure CD_MASK_BAREMESH for now */ - BMEditMesh *em = (ob == scene->obedit) ? BMEdit_FromObject(ob) : NULL; + BMEditMesh *em = (ob == scene->obedit) ? BKE_editmesh_from_object(ob) : NULL; uint64_t data_mask = scene->customdata_mask | ob->customdata_mask | CD_MASK_BAREMESH; if (em) { makeDerivedMesh(scene, ob, em, data_mask, 0); /* was CD_MASK_BAREMESH */ -- cgit v1.2.3