diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-03-02 16:09:49 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-03-02 16:09:49 +0400 |
commit | 622ac0dd1682fd4949319817fd6e58fc7d7c86ed (patch) | |
tree | c52790d29ae0d7f405ad8482b6e4d68a358ea1ac /source/blender/blenkernel/intern | |
parent | cf927d3fd149cbbba4732c789ccbac239f4000f3 (diff) |
code cleanup:
replace casts: '((Mesh *)ob->data)->edit_btmesh' with 'BMEdit_FromObject(ob)'
also minor style edits.
Diffstat (limited to 'source/blender/blenkernel/intern')
-rw-r--r-- | source/blender/blenkernel/intern/editderivedmesh.c | 14 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/object.c | 4 |
2 files changed, 15 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/editderivedmesh.c b/source/blender/blenkernel/intern/editderivedmesh.c index f73a2ff6c1a..f0fb5cc64b4 100644 --- a/source/blender/blenkernel/intern/editderivedmesh.c +++ b/source/blender/blenkernel/intern/editderivedmesh.c @@ -47,9 +47,9 @@ #include "BKE_paint.h" +#include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" #include "DNA_object_types.h" -#include "DNA_curve_types.h" /* for Curve */ #include "MEM_guardedalloc.h" @@ -1707,3 +1707,15 @@ DerivedMesh *getEditDerivedBMesh( return (DerivedMesh*) bmdm; } + +/** + * \brief Return the BMEditMesh for a given object + * + * \note this function assumes this is a mesh object, + * don't add NULL data check here. caller must do that + */ +BMEditMesh *BMEdit_FromObject(Object *ob) +{ + BLI_assert(ob->type == OB_MESH); + return ((Mesh *) ob->data )->edit_btmesh; +} diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c index 37fb8b4a550..52ddfb67bf8 100644 --- a/source/blender/blenkernel/intern/object.c +++ b/source/blender/blenkernel/intern/object.c @@ -2527,7 +2527,7 @@ void object_handle_update(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)? ((Mesh*)ob->data)->edit_btmesh : NULL; + BMEditMesh *em = (ob == scene->obedit) ? BMEdit_FromObject(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 */ @@ -2537,7 +2537,7 @@ void object_handle_update(Scene *scene, Object *ob) } #else /* ensure CD_MASK_BAREMESH for now */ - BMEditMesh *em = (ob == scene->obedit)? ((Mesh*)ob->data)->edit_btmesh : NULL; + BMEditMesh *em = (ob == scene->obedit) ? BMEdit_FromObject(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 */ |