- Enable shape key switching in edit mode for curves, surfaces and latticies

- Disable changing of lattice size if there are shape keys

1 files changed, 6 insertions, 5 deletions

diff --git a/source/blender/editors/object/object_hook.c b/source/blender/editors/object/object_hook.c
index 2ee82a194cc..75e22d5356f 100644
--- a/source/blender/editors/object/object_hook.c
+++ b/source/blender/editors/object/object_hook.c
@@ -191,13 +191,14 @@ static int return_editlattice_indexar(Lattice *editlatt, int *tot, int **indexar
 
 static void select_editlattice_hook(Object *obedit, HookModifierData *hmd)
 {
-	Lattice *lt= obedit->data;
+	Lattice *lt= obedit->data, *editlt;
 	BPoint *bp;
 	int index=0, nr=0, a;
-	
+
+	editlt= lt->editlatt->latt;
 	/* count */
-	a= lt->editlatt->pntsu*lt->editlatt->pntsv*lt->editlatt->pntsw;
-	bp= lt->editlatt->def;
+	a= editlt->pntsu*editlt->pntsv*editlt->pntsw;
+	bp= editlt->def;
 	while(a--) {
 		if(hmd->indexar[index]==nr) {
 			bp->f1 |= SELECT;
@@ -313,7 +314,7 @@ static int object_hook_index_array(Object *obedit, int *tot, int **indexar, char
 		case OB_LATTICE:
 		{
 			Lattice *lt= obedit->data;
-			return return_editlattice_indexar(lt->editlatt, tot, indexar, cent_r);
+			return return_editlattice_indexar(lt->editlatt->latt, tot, indexar, cent_r);
 		}
 		default:
 			return 0;