diff options
Diffstat (limited to 'source/blender/blenkernel/intern/shrinkwrap.c')
| -rw-r--r-- | source/blender/blenkernel/intern/shrinkwrap.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/source/blender/blenkernel/intern/shrinkwrap.c b/source/blender/blenkernel/intern/shrinkwrap.c index 5b6c6bf8732..ce956fcb236 100644 --- a/source/blender/blenkernel/intern/shrinkwrap.c +++ b/source/blender/blenkernel/intern/shrinkwrap.c @@ -44,6 +44,7 @@ #include "DNA_meshdata_types.h" #include "DNA_mesh_types.h" #include "DNA_scene_types.h" +#include "DNA_windowmanager_types.h" #include "BLI_editVert.h" #include "BLI_math.h" @@ -56,6 +57,8 @@ #include "BKE_deform.h" #include "BKE_mesh.h" #include "BKE_subsurf.h" +#include "BKE_mesh.h" +#include "BKE_tessmesh.h" /* Util macros */ #define OUT_OF_MEMORY() ((void)printf("Shrinkwrap: Out of memory\n")) @@ -91,11 +94,11 @@ typedef void ( *Shrinkwrap_ForeachVertexCallback) (DerivedMesh *target, float *c DerivedMesh *object_get_derived_final(Object *ob) { Mesh *me= ob->data; - EditMesh *em = BKE_mesh_get_editmesh(me); + BMEditMesh *em = me->edit_btmesh; - if(em) { + if (em) + { DerivedMesh *dm = em->derivedFinal; - BKE_mesh_end_editmesh(me, em); return dm; } @@ -601,7 +604,9 @@ void shrinkwrapModifier_deform(ShrinkwrapModifierData *smd, Object *ob, DerivedM } //free memory - if(ss_mesh) + if(ss_mesh) { + ss_mesh->needsFree = 1; ss_mesh->release(ss_mesh); + } } |