diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-04-21 13:03:04 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-04-21 13:03:04 +0400 |
| commit | 62a02764abea8c73f14f36a5b45058ce8a7e4f36 (patch) | |
| tree | e8c0ced3c8c488a5653032b5812d08f4c48919e1 | |
| parent | cb06c4eee17a9724cf39f9694c1e68581dcb1a12 (diff) | |
fix [#27096] Segmentation Fault trying to export DirectX with specific model
copying a mesh in editmode didnt NULL the edit_mesh pointer.
| -rw-r--r-- | source/blender/blenkernel/intern/mesh.c | 2 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/particle.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/mesh.c b/source/blender/blenkernel/intern/mesh.c index 29ddd3a55e5..ebbc18cdce9 100644 --- a/source/blender/blenkernel/intern/mesh.c +++ b/source/blender/blenkernel/intern/mesh.c @@ -236,6 +236,8 @@ Mesh *copy_mesh(Mesh *me) } men->mselect= NULL; + men->edit_mesh= NULL; + men->pv= NULL; /* looks like this is no-longer supported but NULL just incase */ men->bb= MEM_dupallocN(men->bb); diff --git a/source/blender/blenkernel/intern/particle.c b/source/blender/blenkernel/intern/particle.c index ac9c46511a6..927f4863e2d 100644 --- a/source/blender/blenkernel/intern/particle.c +++ b/source/blender/blenkernel/intern/particle.c @@ -264,7 +264,6 @@ static void psys_create_frand(ParticleSystem *psys) int psys_check_enabled(Object *ob, ParticleSystem *psys) { ParticleSystemModifierData *psmd; - Mesh *me; if(psys->flag & PSYS_DISABLED || psys->flag & PSYS_DELETE || !psys->part) return 0; |