[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [33689] trunk/blender/source/blender/ blenkernel/intern/image.c: Bugfix, irc report:

Ton Roosendaal ton at blender.org
Wed Dec 15 17:15:52 CET 2010


Revision: 33689
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=33689
Author:   ton
Date:     2010-12-15 17:15:52 +0100 (Wed, 15 Dec 2010)

Log Message:
-----------
Bugfix, irc report:

Stamp info was calling log10 on zero, when end-frame was zero.
Caused crash! Thanks Sergey for report.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/image.c

Modified: trunk/blender/source/blender/blenkernel/intern/image.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/image.c	2010-12-15 16:07:49 UTC (rev 33688)
+++ trunk/blender/source/blender/blenkernel/intern/image.c	2010-12-15 16:15:52 UTC (rev 33689)
@@ -940,8 +940,13 @@
 	
 	if (scene->r.stamp & R_STAMP_FRAME) {
 		char format[32];
-		if (do_prefix)		sprintf(format, "Frame %%0%di", 1 + (int) log10(scene->r.efra));
-		else				sprintf(format, "%%0%di", 1 + (int) log10(scene->r.efra));
+		int digits= 1;
+		
+		if(scene->r.efra>9)
+			digits= 1 + (int) log10(scene->r.efra);
+		
+		if (do_prefix)		sprintf(format, "Frame %%0%di", digits);
+		else				sprintf(format, "%%0%di", digits);
 		sprintf (stamp_data->frame, format, scene->r.cfra);
 	} else {
 		stamp_data->frame[0] = '\0';





More information about the Bf-blender-cvs mailing list