Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTon Roosendaal <ton@blender.org>2010-12-15 19:15:52 +0300
committerTon Roosendaal <ton@blender.org>2010-12-15 19:15:52 +0300
commitbc64d8dcd852443e387d374a35f57bd9e1c38963 (patch)
tree1daa419eea177a7318d5f85ea888d18ec0262aad /source/blender/blenkernel/intern/image.c
parentee09aeb498ee51deb8f5255cf176344a0e64aafb (diff)
Bugfix, irc report:
Stamp info was calling log10 on zero, when end-frame was zero. Caused crash! Thanks Sergey for report.
Diffstat (limited to 'source/blender/blenkernel/intern/image.c')
-rw-r--r--source/blender/blenkernel/intern/image.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/image.c b/source/blender/blenkernel/intern/image.c
index eb85db89835..4a40982b62e 100644
--- a/source/blender/blenkernel/intern/image.c
+++ b/source/blender/blenkernel/intern/image.c
@@ -940,8 +940,13 @@ static void stampdata(Scene *scene, StampData *stamp_data, int do_prefix)
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';