[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [33444] trunk/blender/source/blender: Fix #25017: Bezier Curve Deform Twisting after adding Shape Keys

[Sergey Sharybin]

Revision: 33444
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=33444
Author:   nazgul
Date:     2010-12-03 15:35:03 +0100 (Fri, 03 Dec 2010)

Log Message:
-----------
Fix #25017: Bezier Curve Deform Twisting after adding Shape Keys

- Invalid step was used in curve_applyKeyVertexTilts
- Minor cleanup in editcurve stuff

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/curve.c
    trunk/blender/source/blender/editors/curve/editcurve.c

Modified: trunk/blender/source/blender/blenkernel/intern/curve.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/curve.c	2010-12-03 14:26:03 UTC (rev 33443)
+++ trunk/blender/source/blender/blenkernel/intern/curve.c	2010-12-03 14:35:03 UTC (rev 33444)
@@ -3056,7 +3056,7 @@
 			for(i=0; i<nu->pntsu; i++,bezt++) {
 				key+=3*3;
 				bezt->alfa= *key;
-				key++;
+				key+=3;
 			}
 		}
 		else {

Modified: trunk/blender/source/blender/editors/curve/editcurve.c
===================================================================
--- trunk/blender/source/blender/editors/curve/editcurve.c	2010-12-03 14:26:03 UTC (rev 33443)
+++ trunk/blender/source/blender/editors/curve/editcurve.c	2010-12-03 14:35:03 UTC (rev 33444)
@@ -776,7 +776,6 @@
 								for (j= 0; j < 3; ++j) {
 									VECSUB(ofs[i], bezt->vec[j], oldbezt->vec[j]);
 									i++;
-									// fp+= 3; // unused
 								}
 								ofs[i++][0]= bezt->alfa - oldbezt->alfa;
 							} else {
@@ -796,7 +795,6 @@
 							}
 							i += 2;
 							++bp;
-							// fp += 4; //unused
 						}
 					}