[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [35917] trunk/blender/source/blender/ blenlib/intern/path_util.c: fix for own error r35877, was ignoring #' s in file path by using the digits value passed rather then the number of digits in the string .

Campbell Barton ideasman42 at gmail.com
Thu Mar 31 12:31:15 CEST 2011


Revision: 35917
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=35917
Author:   campbellbarton
Date:     2011-03-31 10:31:14 +0000 (Thu, 31 Mar 2011)
Log Message:
-----------
fix for own error r35877, was ignoring #'s in file path by using the digits value passed rather then the number of digits in the string.

Revision Links:
--------------
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=35877

Modified Paths:
--------------
    trunk/blender/source/blender/blenlib/intern/path_util.c

Modified: trunk/blender/source/blender/blenlib/intern/path_util.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/path_util.c	2011-03-31 08:49:52 UTC (rev 35916)
+++ trunk/blender/source/blender/blenlib/intern/path_util.c	2011-03-31 10:31:14 UTC (rev 35917)
@@ -587,7 +587,7 @@
 
 	if (stringframe_chars(path, &ch_sta, &ch_end)) { /* warning, ch_end is the last # +1 */
 		char tmp[FILE_MAX];
-		sprintf(tmp, "%.*s%.*d%s", ch_sta, path, digits, frame, path+ch_end);
+		sprintf(tmp, "%.*s%.*d%s", ch_sta, path, ch_end-ch_sta, frame, path+ch_end);
 		strcpy(path, tmp);
 		return 1;
 	}
@@ -603,7 +603,7 @@
 
 	if (stringframe_chars(path, &ch_sta, &ch_end)) { /* warning, ch_end is the last # +1 */
 		char tmp[FILE_MAX];
-		sprintf(tmp, "%.*s%.*d-%.*d%s", ch_sta, path, digits, sta, digits, end, path+ch_end);
+		sprintf(tmp, "%.*s%.*d-%.*d%s", ch_sta, path, ch_end-ch_sta, sta, ch_end-ch_sta, end, path+ch_end);
 		strcpy(path, tmp);
 		return 1;
 	}




More information about the Bf-blender-cvs mailing list