kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

fix for segfault when setting handle type

Browse Source
This commit is contained in:
Campbell Barton 2010-02-08 14:34:23 +00:00
parent 12f6c667d9
commit 03bdfb6f31
1 changed files with 22 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
source/blender/editors/animation/keyframes_edit.c
View File

@ -89,52 +89,59 @@
*/ */
short ANIM_fcurve_keys_bezier_loop(BeztEditData *bed, FCurve *fcu, BeztEditFunc bezt_ok, BeztEditFunc bezt_cb, FcuEditFunc fcu_cb) short ANIM_fcurve_keys_bezier_loop(BeztEditData *bed, FCurve *fcu, BeztEditFunc bezt_ok, BeztEditFunc bezt_cb, FcuEditFunc fcu_cb)
{ {
BezTriple *bezt; BezTriple *bezt;
int i;
/* sanity check */ /* sanity check */
if (ELEM(NULL, fcu, fcu->bezt)) if (ELEM(NULL, fcu, fcu->bezt))
return 0; return 0;
/* set the F-Curve into the editdata so that it can be accessed */ /* set the F-Curve into the editdata so that it can be accessed */
bed->fcu= fcu; if(bed) {
bed->curIndex= 0; bed->fcu= fcu;
bed->curIndex= 0;
}
/* if function to apply to bezier curves is set, then loop through executing it on beztriples */ /* if function to apply to bezier curves is set, then loop through executing it on beztriples */
if (bezt_cb) { if (bezt_cb) {
/* if there's a validation func, include that check in the loop /* if there's a validation func, include that check in the loop
* (this is should be more efficient than checking for it in every loop) * (this is should be more efficient than checking for it in every loop)
*/ */
if (bezt_ok) { if (bezt_ok) {
for (bed->curIndex=0, bezt=fcu->bezt; bed->curIndex < fcu->totvert; bed->curIndex++, bezt++) { for (bezt=fcu->bezt, i=0; i < fcu->totvert; bezt++, i++) {
/* Only operate on this BezTriple if it fullfills the criteria of the validation func */ /* Only operate on this BezTriple if it fullfills the criteria of the validation func */
if(bed) bed->curIndex= i;
if (bezt_ok(bed, bezt)) { if (bezt_ok(bed, bezt)) {
/* Exit with return-code '1' if function returns positive /* Exit with return-code '1' if function returns positive
* This is useful if finding if some BezTriple satisfies a condition. * This is useful if finding if some BezTriple satisfies a condition.
*/ */
if (bezt_cb(bed, bezt)) return 1; if (bezt_cb(bed, bezt)) return 1;
} }
} }
} }
else { else {
for (bed->curIndex=0, bezt=fcu->bezt; bed->curIndex < fcu->totvert; bed->curIndex++, bezt++) { for (bezt=fcu->bezt, i=0; i < fcu->totvert; bezt++, i++) {
/* Exit with return-code '1' if function returns positive /* Exit with return-code '1' if function returns positive
* This is useful if finding if some BezTriple satisfies a condition. * This is useful if finding if some BezTriple satisfies a condition.
*/ */
if (bezt_cb(bed, bezt)) return 1; if(bed) bed->curIndex= i;
if (bezt_cb(bed, bezt)) return 1;
} }
} }
} }
/* unset the F-Curve from the editdata now that it's done */ /* unset the F-Curve from the editdata now that it's done */
bed->fcu= NULL; if(bed) {
bed->curIndex= 0; bed->fcu= NULL;
bed->curIndex= 0;
}
/* if fcu_cb (F-Curve post-editing callback) has been specified then execute it */ /* if fcu_cb (F-Curve post-editing callback) has been specified then execute it */
if (fcu_cb) if (fcu_cb)
fcu_cb(fcu); fcu_cb(fcu);
/* done */ /* done */
return 0; return 0;
} }
/* -------------------------------- Further Abstracted (Not Exposed Directly) ----------------------------- */ /* -------------------------------- Further Abstracted (Not Exposed Directly) ----------------------------- */