From cc9dbc7ac259e6f8547a58904bf5f834e14d58bc Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Mon, 26 Jul 2010 19:07:33 +0000 Subject: Curve shape keys: - Fixed incorrect working of "from mix" insert keyblock operator property shapekey coordinated are applying on curve's data when creating displist, so curve's nurbs can't be used as unchanged data -- use basis keyblock data instead - Fixed tilt damaging when loading editcurve -- made a typo in array indexes --- source/blender/editors/curve/editcurve.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source/blender/editors') diff --git a/source/blender/editors/curve/editcurve.c b/source/blender/editors/curve/editcurve.c index 8d8dac33f9f..d38c91da5c5 100644 --- a/source/blender/editors/curve/editcurve.c +++ b/source/blender/editors/curve/editcurve.c @@ -884,7 +884,7 @@ static void calc_shapeKeys(Object *obedit) fp+= 3; curofp+= 3; } - fp[0]= ofp[0]; + fp[0]= curofp[0]; if(apply_offset) { /* apply alfa offsets */ @@ -914,7 +914,7 @@ static void calc_shapeKeys(Object *obedit) if (index >= 0) { curofp= ofp + index; VECCOPY(fp, curofp); - fp[3]= curofp[4]; + fp[3]= curofp[3]; if(apply_offset) { VECADD(fp, fp, ofs[i]); -- cgit v1.2.3