[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [25149] trunk/blender/source/blender/ editors: Assorted warning and comment fixes

Joshua Leung aligorith at gmail.com
Sun Dec 6 10:37:32 CET 2009


Revision: 25149
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=25149
Author:   aligorith
Date:     2009-12-06 10:37:31 +0100 (Sun, 06 Dec 2009)

Log Message:
-----------
Assorted warning and comment fixes

Modified Paths:
--------------
    trunk/blender/source/blender/editors/animation/keyframes_draw.c
    trunk/blender/source/blender/editors/space_action/action_edit.c
    trunk/blender/source/blender/editors/space_graph/graph_edit.c
    trunk/blender/source/blender/editors/transform/transform_conversions.c

Modified: trunk/blender/source/blender/editors/animation/keyframes_draw.c
===================================================================
--- trunk/blender/source/blender/editors/animation/keyframes_draw.c	2009-12-06 04:35:00 UTC (rev 25148)
+++ trunk/blender/source/blender/editors/animation/keyframes_draw.c	2009-12-06 09:37:31 UTC (rev 25149)
@@ -229,6 +229,7 @@
 	/* 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");
 	}

Modified: trunk/blender/source/blender/editors/space_action/action_edit.c
===================================================================
--- trunk/blender/source/blender/editors/space_action/action_edit.c	2009-12-06 04:35:00 UTC (rev 25148)
+++ trunk/blender/source/blender/editors/space_action/action_edit.c	2009-12-06 09:37:31 UTC (rev 25149)
@@ -622,7 +622,7 @@
 			
 			/* 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);

Modified: trunk/blender/source/blender/editors/space_graph/graph_edit.c
===================================================================
--- trunk/blender/source/blender/editors/space_graph/graph_edit.c	2009-12-06 04:35:00 UTC (rev 25148)
+++ trunk/blender/source/blender/editors/space_graph/graph_edit.c	2009-12-06 09:37:31 UTC (rev 25149)
@@ -793,13 +793,14 @@
 	/* 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 */

Modified: trunk/blender/source/blender/editors/transform/transform_conversions.c
===================================================================
--- trunk/blender/source/blender/editors/transform/transform_conversions.c	2009-12-06 04:35:00 UTC (rev 25148)
+++ trunk/blender/source/blender/editors/transform/transform_conversions.c	2009-12-06 09:37:31 UTC (rev 25149)
@@ -2926,11 +2926,11 @@
  */
 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 @@
 	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 @@
 			/* 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;





More information about the Bf-blender-cvs mailing list