[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [32973] trunk/blender/source/blender/ blenkernel/intern/anim.c: correct some comments and fix for allocating more memory then needed for animation paths .
Campbell Barton
ideasman42 at gmail.com
Wed Nov 10 05:58:38 CET 2010
Revision: 32973
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=32973
Author: campbellbarton
Date: 2010-11-10 05:58:37 +0100 (Wed, 10 Nov 2010)
Log Message:
-----------
correct some comments and fix for allocating more memory then needed for animation paths.
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/anim.c
Modified: trunk/blender/source/blender/blenkernel/intern/anim.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/anim.c 2010-11-10 01:40:24 UTC (rev 32972)
+++ trunk/blender/source/blender/blenkernel/intern/anim.c 2010-11-10 04:58:37 UTC (rev 32973)
@@ -436,6 +436,7 @@
/* free curve path data
* NOTE: frees the path itself!
+ * NOTE: this is increasingly innacurate with non-uniform BevPoint subdivisions [#24633]
*/
void free_path(Path *path)
{
@@ -444,7 +445,7 @@
}
/* calculate a curve-deform path for a curve
- * - only called from displist.c -> makeDispListCurveTypes
+ * - only called from displist.c -> do_makeDispListCurveTypes
*/
void calc_curvepath(Object *ob)
{
@@ -507,7 +508,7 @@
/* the path verts in path->data */
/* now also with TILT value */
- pp= path->data = (PathPoint *)MEM_callocN(sizeof(PathPoint)*4*path->len, "pathdata"); // XXX - why *4? - in 2.4x each element was 4 and the size was 16, so better leave for now - Campbell
+ pp= path->data = (PathPoint *)MEM_callocN(sizeof(PathPoint)*path->len, "pathdata");
bevp= bevpfirst;
bevpn= bevp+1;
@@ -637,7 +638,6 @@
vec[1]= data[0]*p0->vec[1] + data[1]*p1->vec[1] + data[2]*p2->vec[1] + data[3]*p3->vec[1] ; /* Y */
vec[2]= data[0]*p0->vec[2] + data[1]*p1->vec[2] + data[2]*p2->vec[2] + data[3]*p3->vec[2] ; /* Z */
vec[3]= data[0]*p0->vec[3] + data[1]*p1->vec[3] + data[2]*p2->vec[3] + data[3]*p3->vec[3] ; /* Tilt, should not be needed since we have quat still used */
- /* Need to verify the quat interpolation is correct - XXX */
if (quat) {
float totfac, q1[4], q2[4];
More information about the Bf-blender-cvs
mailing list