Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Quick fix: translating header's string with some languages (complex scripts, like Japanese or Hindi) generates a very odd segfault! Have really no time to fix now, will try in a few hours, but safer to do this for now!

Browse Source
This commit is contained in:
Bastien Montagne
2013-02-20 13:41:29 +00:00
parent d9d1f8e58f
commit f844b79577
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
source/blender/editors/space_info/info_stats.c
View File

@@ -367,9 +367,9 @@ static void stats_string(Scene *scene)
mmap_in_use = MEM_get_mapped_memory_in_use(); mmap_in_use = MEM_get_mapped_memory_in_use();
/* get memory statistics */ /* get memory statistics */
s = memstr + sprintf(memstr, IFACE_(" | Mem:%.2fM"), (double)((mem_in_use - mmap_in_use) >> 10) / 1024.0); s = memstr + sprintf(memstr, " | Mem:%.2fM", (double)((mem_in_use - mmap_in_use) >> 10) / 1024.0);
if (mmap_in_use) if (mmap_in_use)
sprintf(s, IFACE_(" (%.2fM)"), (double)((mmap_in_use) >> 10) / 1024.0); sprintf(s, " (%.2fM)", (double)((mmap_in_use) >> 10) / 1024.0);
s = stats->infostr; s = stats->infostr;
@@ -377,32 +377,32 @@ static void stats_string(Scene *scene)
if (scene->obedit) { if (scene->obedit) {
if (BKE_keyblock_from_object(scene->obedit)) if (BKE_keyblock_from_object(scene->obedit))
s += sprintf(s, IFACE_("(Key) ")); s += sprintf(s, "(Key) ");
if (scene->obedit->type == OB_MESH) { if (scene->obedit->type == OB_MESH) {
s += sprintf(s, IFACE_("Verts:%d/%d | Edges:%d/%d | Faces:%d/%d | Tris:%d"), s += sprintf(s, "Verts:%d/%d | Edges:%d/%d | Faces:%d/%d | Tris:%d",
stats->totvertsel, stats->totvert, stats->totedgesel, stats->totedge, stats->totfacesel, stats->totvertsel, stats->totvert, stats->totedgesel, stats->totedge, stats->totfacesel,
stats->totface, stats->tottri); stats->totface, stats->tottri);
} }
else if (scene->obedit->type == OB_ARMATURE) { else if (scene->obedit->type == OB_ARMATURE) {
s += sprintf(s, IFACE_("Verts:%d/%d | Bones:%d/%d"), stats->totvertsel, stats->totvert, stats->totbonesel, s += sprintf(s, "Verts:%d/%d | Bones:%d/%d", stats->totvertsel, stats->totvert, stats->totbonesel,
stats->totbone); stats->totbone);
} }
else { else {
s += sprintf(s, IFACE_("Verts:%d/%d"), stats->totvertsel, stats->totvert); s += sprintf(s, "Verts:%d/%d", stats->totvertsel, stats->totvert);
} }
strcat(s, memstr); strcat(s, memstr);
} }
else if (ob && (ob->mode & OB_MODE_POSE)) { else if (ob && (ob->mode & OB_MODE_POSE)) {
s += sprintf(s, IFACE_("Bones:%d/%d %s"), s += sprintf(s, "Bones:%d/%d %s",
stats->totbonesel, stats->totbone, memstr); stats->totbonesel, stats->totbone, memstr);
} }
else if (stats_is_object_dynamic_topology_sculpt(ob)) { else if (stats_is_object_dynamic_topology_sculpt(ob)) {
s += sprintf(s, IFACE_("Verts:%d | Tris:%d"), stats->totvert, stats->tottri); s += sprintf(s, "Verts:%d | Tris:%d", stats->totvert, stats->tottri);
} }
else { else {
s += sprintf(s, IFACE_("Verts:%d | Faces:%d | Tris:%d | Objects:%d/%d | Lamps:%d/%d%s"), s += sprintf(s, "Verts:%d | Faces:%d | Tris:%d | Objects:%d/%d | Lamps:%d/%d%s",
stats->totvert, stats->totface, stats->tottri, stats->totobjsel, stats->totobj, stats->totlampsel, stats->totvert, stats->totface, stats->tottri, stats->totobjsel, stats->totobj, stats->totlampsel,
stats->totlamp, memstr); stats->totlamp, memstr);
} }