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
path: root/source
diff options
context:
space:
mode:
authorTon Roosendaal <ton@blender.org>2006-07-02 17:08:27 +0400
committerTon Roosendaal <ton@blender.org>2006-07-02 17:08:27 +0400
commitc6af151b000e100c4b1143339760a4077360e969 (patch)
tree93b518847a204f545d57fdf6a263ae42f951492b /source
parent3c1956f5cdafaa14ced3cce3e2e07daca0633247 (diff)
Bugfix #4536
FTF_GetStringWidth() was calling for translations, whilst translation was not set even, causing crashes in strings. Probably this was instable for many cases using Internation Font...
Diffstat (limited to 'source')
-rw-r--r--source/blender/src/language.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/src/language.c b/source/blender/src/language.c
index 6f5f89845f1..5762681ec9d 100644
--- a/source/blender/src/language.c
+++ b/source/blender/src/language.c
@@ -131,7 +131,7 @@ float BIF_GetStringWidth(BMF_Font* font, char *str, int translate)
#ifdef INTERNATIONAL
if(G.ui_international == TRUE)
- if(U.transopts & USER_TR_BUTTONS)
+ if(translate && (U.transopts & USER_TR_BUTTONS))
rt= FTF_GetStringWidth(str, FTF_USE_GETTEXT | FTF_INPUT_UTF8);
else
rt= FTF_GetStringWidth(str, FTF_NO_TRANSCONV | FTF_INPUT_UTF8);