diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2010-08-10 10:36:42 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2010-08-10 10:36:42 +0400 |
| commit | c0e39df6ac42d137fd51eeea463aace856bf97d4 (patch) | |
| tree | 86be54ecb6f01b8192905a05707b12402970d5a4 /source/blender/editors/object/object_vgroup.c | |
| parent | 41531e4fb6547df543a80d62b473c250d5b78753 (diff) | |
- Enable shape key switching in edit mode for curves, surfaces and latticies
- Disable changing of lattice size if there are shape keys
Diffstat (limited to 'source/blender/editors/object/object_vgroup.c')
| -rw-r--r-- | source/blender/editors/object/object_vgroup.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/editors/object/object_vgroup.c b/source/blender/editors/object/object_vgroup.c index 86f0c5fa874..5cdabcab41a 100644 --- a/source/blender/editors/object/object_vgroup.c +++ b/source/blender/editors/object/object_vgroup.c @@ -73,7 +73,7 @@ static Lattice *vgroup_edit_lattice(Object *ob) { if(ob->type==OB_LATTICE) { Lattice *lt= ob->data; - return (lt->editlatt)? lt->editlatt: lt; + return (lt->editlatt)? lt->editlatt->latt: lt; } return NULL; @@ -169,7 +169,7 @@ int ED_vgroup_give_parray(ID *id, MDeformVert ***dvert_arr, int *dvert_tot) int i=0; Lattice *lt= (Lattice *)id; - lt= (lt->editlatt)? lt->editlatt: lt; + lt= (lt->editlatt)? lt->editlatt->latt: lt; *dvert_tot= lt->pntsu*lt->pntsv*lt->pntsw; *dvert_arr= MEM_mallocN(sizeof(void*)*(*dvert_tot), "vgroup parray from me"); @@ -203,7 +203,7 @@ int ED_vgroup_give_array(ID *id, MDeformVert **dvert_arr, int *dvert_tot) case ID_LT: { Lattice *lt= (Lattice *)id; - lt= (lt->editlatt)? lt->editlatt: lt; + lt= (lt->editlatt)? lt->editlatt->latt: lt; *dvert_arr= lt->dvert; *dvert_tot= lt->pntsu*lt->pntsv*lt->pntsw; return TRUE; |