[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [25620] trunk/blender/source/blender: * Assorted comments/warnings fixes for animation code

[Joshua Leung]

Revision: 25620
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=25620
Author:   aligorith
Date:     2009-12-30 11:21:45 +0100 (Wed, 30 Dec 2009)

Log Message:
-----------
* Assorted comments/warnings fixes for animation code
* Made the dotted lines drawn for markers extend all the way to the top of the relevant views
* Shortened the default names for markers

Modified Paths:
--------------
    trunk/blender/source/blender/editors/animation/anim_markers.c
    trunk/blender/source/blender/editors/animation/keyframes_edit.c
    trunk/blender/source/blender/editors/animation/keyframes_general.c
    trunk/blender/source/blender/makesrna/intern/rna_action.c

Modified: trunk/blender/source/blender/editors/animation/anim_markers.c
===================================================================
--- trunk/blender/source/blender/editors/animation/anim_markers.c	2009-12-29 23:25:46 UTC (rev 25619)
+++ trunk/blender/source/blender/editors/animation/anim_markers.c	2009-12-30 10:21:45 UTC (rev 25620)
@@ -120,7 +120,7 @@
 	int selcount = 0;
 	
 	/* sanity check */
-	printf("markers = %p -  %p, %p \n", markers, markers->first, markers->last);
+	//printf("markers = %p -  %p, %p \n", markers, markers->first, markers->last);
 	if (markers == NULL) {
 		*first = 0.0f;
 		*last = 0.0f;
@@ -240,9 +240,8 @@
 	glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);			
 	
 	/* vertical line - dotted */
-	// NOTE: currently only used for sequencer
 #ifdef DURIAN_CAMERA_SWITCH
-	if (marker->camera || flag & DRAW_MARKERS_LINES) {
+	if ((marker->camera) || (flag & DRAW_MARKERS_LINES)) {
 #else
 	if (flag & DRAW_MARKERS_LINES) {
 #endif
@@ -252,10 +251,10 @@
 			glColor4ub(255, 255, 255, 96);
 		else
 			glColor4ub(0, 0, 0, 96);
-
+		
 		glBegin(GL_LINES);
 			glVertex2f((xpos*xscale)+0.5f, 12.0f);
-			glVertex2f((xpos*xscale)+0.5f, 34.0f*yscale); /* a bit lazy but we know it cant be greater then 34 strips high */
+			glVertex2f((xpos*xscale)+0.5f, (v2d->cur.ymax+12.0f)*yscale);
 		glEnd();
 		
 		setlinestyle(0);
@@ -351,7 +350,7 @@
 	marker = MEM_callocN(sizeof(TimeMarker), "TimeMarker");
 	marker->flag= SELECT;
 	marker->frame= frame;
-	sprintf(marker->name, "Frame %d", frame); // XXX - temp code only
+	sprintf(marker->name, "F_%02d", frame); // XXX - temp code only
 	BLI_addtail(markers, marker);
 	
 	WM_event_add_notifier(C, NC_SCENE|ND_MARKERS, NULL);

Modified: trunk/blender/source/blender/editors/animation/keyframes_edit.c
===================================================================
--- trunk/blender/source/blender/editors/animation/keyframes_edit.c	2009-12-29 23:25:46 UTC (rev 25619)
+++ trunk/blender/source/blender/editors/animation/keyframes_edit.c	2009-12-30 10:21:45 UTC (rev 25620)
@@ -455,11 +455,11 @@
 	filter= ANIMFILTER_CURVESONLY; 
 	ANIM_animdata_filter(ac, &anim_data, filter, ac->data, ac->datatype);
 	
-	/* loop over ipo-curves that are likely to have been edited, and check them */
+	/* loop over F-Curves that are likely to have been edited, and check them */
 	for (ale= anim_data.first; ale; ale= ale->next) {
 		FCurve *fcu= ale->key_data;
 		
-		/* make sure keyframes in F-curve are all in order, and handles are in valid positions */
+		/* make sure keyframes in F-Curve are all in order, and handles are in valid positions */
 		sort_time_fcurve(fcu);
 		testhandles_fcurve(fcu);
 	}
@@ -936,7 +936,6 @@
 	return 0;
 }
 
-// NULL
 BeztEditFunc ANIM_editkeyframes_select(short selectmode)
 {
 	switch (selectmode) {

Modified: trunk/blender/source/blender/editors/animation/keyframes_general.c
===================================================================
--- trunk/blender/source/blender/editors/animation/keyframes_general.c	2009-12-29 23:25:46 UTC (rev 25619)
+++ trunk/blender/source/blender/editors/animation/keyframes_general.c	2009-12-30 10:21:45 UTC (rev 25620)
@@ -67,21 +67,26 @@
  
 /* **************************************************** */
 
-/* Only delete the nominated keyframe from provided ipo-curve. 
+/* Only delete the nominated keyframe from provided F-Curve. 
  * Not recommended to be used many times successively. For that
- * there is delete_ipo_keys(). 
+ * there is delete_fcurve_keys(). 
  */
 void delete_fcurve_key(FCurve *fcu, int index, short do_recalc)
 {
-	/* firstly check that index is valid */
-	if (index < 0) 
-		index *= -1;
+	/* sanity check */
 	if (fcu == NULL) 
 		return;
-	if (index >= fcu->totvert)
+		
+	/* verify the index:
+	 *	1) cannot be greater than the number of available keyframes
+	 *	2) negative indices are for specifying a value from the end of the array
+	 */
+	if (abs(index) >= fcu->totvert)
 		return;
+	else if (index < 0)
+		index += fcu->totvert;
 	
-	/*	Delete this key */
+	/* Delete this keyframe */
 	memmove(&fcu->bezt[index], &fcu->bezt[index+1], sizeof(BezTriple)*(fcu->totvert-index-1));
 	fcu->totvert--;
 	
@@ -250,7 +255,7 @@
 
 /* ---------------- */
 
-/* temp struct used for smooth_ipo */
+/* temp struct used for smooth_fcurve */
 typedef struct tSmooth_Bezt {
 	float *h1, *h2, *h3;	/* bezt->vec[0,1,2][1] */
 } tSmooth_Bezt;

Modified: trunk/blender/source/blender/makesrna/intern/rna_action.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_action.c	2009-12-29 23:25:46 UTC (rev 25619)
+++ trunk/blender/source/blender/makesrna/intern/rna_action.c	2009-12-30 10:21:45 UTC (rev 25620)
@@ -88,7 +88,7 @@
 
 	prop= RNA_def_property(srna, "display_summary", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "filterflag", ADS_FILTER_SUMMARY);
-	RNA_def_property_ui_text(prop, "Display Summary", "Display an additional 'summary' line.");
+	RNA_def_property_ui_text(prop, "Display Summary", "Display an additional 'summary' line. (DopeSheet Editors only)");
 	RNA_def_property_ui_icon(prop, ICON_BORDERMOVE, 0);
 	RNA_def_property_update(prop, NC_ANIMATION|ND_ANIMCHAN_EDIT, NULL);