diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-03-30 06:59:32 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-03-30 06:59:32 +0400 |
| commit | 70162a4abd61df29f8ee451d94eeee6315d6155f (patch) | |
| tree | 11a8ce3e4a87f6c151430ff755ed4f0aaa2c6af8 /source/blender/blenkernel/intern/lattice.c | |
| parent | 77e3eac3897975a82e1c68468002a5eb0f00a8b5 (diff) | |
fix [#26682] Accessing weight sometimes crashes blender
also replace object type check from vgroup_edit_lattice() with an assert since all callers check for lattice type.
Diffstat (limited to 'source/blender/blenkernel/intern/lattice.c')
| -rw-r--r-- | source/blender/blenkernel/intern/lattice.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/source/blender/blenkernel/intern/lattice.c b/source/blender/blenkernel/intern/lattice.c index f66afff0741..9d93bb1c25d 100644 --- a/source/blender/blenkernel/intern/lattice.c +++ b/source/blender/blenkernel/intern/lattice.c @@ -1031,13 +1031,8 @@ void lattice_calc_modifiers(Scene *scene, Object *ob) struct MDeformVert* lattice_get_deform_verts(struct Object *oblatt) { - if(oblatt->type == OB_LATTICE) - { - Lattice *lt = (Lattice*)oblatt->data; - if(lt->editlatt) lt= lt->editlatt->latt; - return lt->dvert; - } - - return NULL; + Lattice *lt = (Lattice*)oblatt->data; + BLI_assert(oblatt->type == OB_LATTICE); + if(lt->editlatt) lt= lt->editlatt->latt; + return lt->dvert; } - |