diff options
| author | Joseph Eagar <joeedh@gmail.com> | 2009-05-18 12:46:04 +0400 |
|---|---|---|
| committer | Joseph Eagar <joeedh@gmail.com> | 2009-05-18 12:46:04 +0400 |
| commit | 0ba863de29ad6768260e1b4e67f3eec9c8ae4c81 (patch) | |
| tree | b1c606be25678a749abcb46a5877d8ec262c15ba /source/blender/blenkernel/intern/shrinkwrap.c | |
| parent | 166c270f060e0ffadbc53c27afb112f294e7425e (diff) | |
renamed BMTessMesh to BMEditMesh, did some more monkeywork, cleaned up the more serious warnings, and also non-backbuffered selection sortof works now, though it still needs plenty of work.
Diffstat (limited to 'source/blender/blenkernel/intern/shrinkwrap.c')
| -rw-r--r-- | source/blender/blenkernel/intern/shrinkwrap.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/shrinkwrap.c b/source/blender/blenkernel/intern/shrinkwrap.c index 92d1f0d1a19..66cc92a19af 100644 --- a/source/blender/blenkernel/intern/shrinkwrap.c +++ b/source/blender/blenkernel/intern/shrinkwrap.c @@ -48,6 +48,8 @@ #include "BKE_displist.h" #include "BKE_global.h" #include "BKE_subsurf.h" +#include "BKE_mesh.h" +#include "BKE_tessmesh.h" #include "BLI_arithb.h" #include "BLI_kdtree.h" @@ -96,14 +98,13 @@ typedef void ( *Shrinkwrap_ForeachVertexCallback) (DerivedMesh *target, float *c static DerivedMesh *object_get_derived_final(struct Scene *scene, Object *ob, CustomDataMask dataMask) { Mesh *me= ob->data; - EditMesh *em = EM_GetEditMesh(me); + BMEditMesh *em = me->edit_btmesh; if (em) { DerivedMesh *final = NULL; editbmesh_get_derived_cage_and_final(scene, ob, em, &final, dataMask); - EM_EndEditMesh(me, em); return final; } else |