diff options
author | Joshua Leung <aligorith@gmail.com> | 2009-12-06 12:37:31 +0300 |
---|---|---|
committer | Joshua Leung <aligorith@gmail.com> | 2009-12-06 12:37:31 +0300 |
commit | ba0981031ae20f1cda43a2491f6347295b6a17d2 (patch) | |
tree | 1b24101b9721a9bc8c2680c35da5a491968bf07f | |
parent | f08e8af0b9568798bd2f59daf1b83dd0f7204ced (diff) |
Assorted warning and comment fixes
4 files changed, 8 insertions, 6 deletions
diff --git a/source/blender/editors/animation/keyframes_draw.c b/source/blender/editors/animation/keyframes_draw.c index 512dc92de1d..15ca0fab35f 100644 --- a/source/blender/editors/animation/keyframes_draw.c +++ b/source/blender/editors/animation/keyframes_draw.c @@ -229,6 +229,7 @@ static void nupdate_abk_bezt (void *node, void *data) /* just add the BezTriple to the buffer if there's space, or allocate a new one */ if (abk->numBezts >= sizeof(abk->bezts)/sizeof(BezTriple)) { // TODO: need to allocate new array to cater... + // FIXME: urgent... is a problem when working with duplicate keyframes //bezts_extra= MEM_callocN(...); printf("FIXME: nupdate_abk_bezt() missing case for too many overlapping BezTriples \n"); } diff --git a/source/blender/editors/space_action/action_edit.c b/source/blender/editors/space_action/action_edit.c index 22f5f1757c9..133d48a5ecc 100644 --- a/source/blender/editors/space_action/action_edit.c +++ b/source/blender/editors/space_action/action_edit.c @@ -622,7 +622,7 @@ static void delete_action_keys (bAnimContext *ac) /* Only delete curve too if it won't be doing anything anymore */ if ((fcu->totvert == 0) && (list_has_suitable_fmodifier(&fcu->modifiers, 0, FMI_TYPE_GENERATE_CURVE) == 0)) - ANIM_fcurve_delete_from_animdata(ac, ale->adt, fcu); + ANIM_fcurve_delete_from_animdata(ac, adt, fcu); } //else // delete_gplayer_frames((bGPDlayer *)ale->data); diff --git a/source/blender/editors/space_graph/graph_edit.c b/source/blender/editors/space_graph/graph_edit.c index 9cf1f57c65f..db50ad983da 100644 --- a/source/blender/editors/space_graph/graph_edit.c +++ b/source/blender/editors/space_graph/graph_edit.c @@ -793,13 +793,14 @@ static void delete_graph_keys (bAnimContext *ac) /* loop through filtered data and delete selected keys */ for (ale= anim_data.first; ale; ale= ale->next) { FCurve *fcu= (FCurve *)ale->key_data; + AnimData *adt= ale->adt; /* delete selected keyframes only */ delete_fcurve_keys(fcu); /* Only delete curve too if it won't be doing anything anymore */ if ((fcu->totvert == 0) && (list_has_suitable_fmodifier(&fcu->modifiers, 0, FMI_TYPE_GENERATE_CURVE) == 0)) - ANIM_fcurve_delete_from_animdata(ac, ale->adt, fcu); + ANIM_fcurve_delete_from_animdata(ac, adt, fcu); } /* free filtered list */ diff --git a/source/blender/editors/transform/transform_conversions.c b/source/blender/editors/transform/transform_conversions.c index 4627db7e89c..9e154bc4db6 100644 --- a/source/blender/editors/transform/transform_conversions.c +++ b/source/blender/editors/transform/transform_conversions.c @@ -2926,11 +2926,11 @@ static void posttrans_gpd_clean (bGPdata *gpd) */ static void posttrans_fcurve_clean (FCurve *fcu) { - float *selcache; /* cache for frame numbers of selected frames (icu->totvert*sizeof(float)) */ + float *selcache; /* cache for frame numbers of selected frames (fcu->totvert*sizeof(float)) */ int len, index, i; /* number of frames in cache, item index */ /* allocate memory for the cache */ - // TODO: investigate using GHash for this instead? + // TODO: investigate using BezTriple columns instead? if (fcu->totvert == 0) return; selcache= MEM_callocN(sizeof(float)*fcu->totvert, "FCurveSelFrameNums"); @@ -2996,7 +2996,7 @@ static void posttrans_action_clean (bAnimContext *ac, bAction *act) filter= (ANIMFILTER_VISIBLE | ANIMFILTER_FOREDIT | ANIMFILTER_CURVESONLY); ANIM_animdata_filter(ac, &anim_data, filter, act, ANIMCONT_ACTION); - /* loop through relevant data, removing keyframes from the ipo-blocks that were attached + /* loop through relevant data, removing keyframes as appropriate * - all keyframes are converted in/out of global time */ for (ale= anim_data.first; ale; ale= ale->next) { @@ -4773,7 +4773,7 @@ void special_aftertrans_update(TransInfo *t) /* get channels to work on */ ANIM_animdata_filter(&ac, &anim_data, filter, ac.data, ac.datatype); - /* these should all be ipo-blocks */ + /* these should all be F-Curves */ for (ale= anim_data.first; ale; ale= ale->next) { AnimData *adt= ANIM_nla_mapping_get(&ac, ale); FCurve *fcu= (FCurve *)ale->key_data; |