[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [20739] branches/blender2.5/blender/source /blender/editors/animation/anim_draw.c: Change separator to one that does not mean drop frame.

gsr b3d gsr.b3d at infernal-iceberg.com
Mon Jun 8 19:46:29 CEST 2009


Revision: 20739
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=20739
Author:   gsrb3d
Date:     2009-06-08 19:46:29 +0200 (Mon, 08 Jun 2009)

Log Message:
-----------
Change separator to one that does not mean drop frame.

Modified Paths:
--------------
    branches/blender2.5/blender/source/blender/editors/animation/anim_draw.c

Modified: branches/blender2.5/blender/source/blender/editors/animation/anim_draw.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/animation/anim_draw.c	2009-06-08 17:30:53 UTC (rev 20738)
+++ branches/blender2.5/blender/source/blender/editors/animation/anim_draw.c	2009-06-08 17:46:29 UTC (rev 20739)
@@ -83,11 +83,11 @@
 	glScalef(1.0f/xscale, 1.0f, 1.0f);
 	
 	if (time) {
-		/* SMPTE timecode style:
+		/* (Pseudo) SMPTE timecode style:
 		 *	- In general, minutes and seconds should be shown, as most clips will be
 		 *	  within this length. Hours will only be included if relevant.
 		 *	- Only show frames when zoomed in enough for them to be relevant 
-		 *	  (using separator convention of ';' for frames, ala QuickTime).
+		 *	  (using separator of '+' for frames).
 		 *	  When showing frames, use slightly different display to avoid confusion with mm:ss format
 		 */
 		float val= FRA2TIME(CFRA);
@@ -124,9 +124,9 @@
 		}
 		
 		/* print timecode to temp string buffer */
-		if (hours) sprintf(str, "   %s%02d:%02d:%02d;%02d", neg, hours, minutes, seconds, frames);
-		else if (minutes) sprintf(str, "   %s%02d:%02d;%02d", neg, minutes, seconds, frames);
-		else sprintf(str, "   %s%d;%02d", neg, seconds, frames);
+		if (hours) sprintf(str, "   %s%02d:%02d:%02d+%02d", neg, hours, minutes, seconds, frames);
+		else if (minutes) sprintf(str, "   %s%02d:%02d+%02d", neg, minutes, seconds, frames);
+		else sprintf(str, "   %s%d+%02d", neg, seconds, frames);
 	}
 	else 
 		sprintf(str, "   %d", CFRA);





More information about the Bf-blender-cvs mailing list