diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2013-02-24 07:39:20 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2013-02-24 07:39:20 +0400 |
| commit | d120ec146d3c28b7243371b0de1edf4ba590470c (patch) | |
| tree | a05f182978c6007bb9193f6ad0b4f2b210394ee8 /source/blender/blenfont | |
| parent | 3df023ae82eef0ea105dc61c9730af87b59a07d1 (diff) | |
| parent | 93c3593d825aafe30aaf051182e50bde4c6084dd (diff) | |
Merged changes in the trunk up to revision 54802.
Diffstat (limited to 'source/blender/blenfont')
| -rw-r--r-- | source/blender/blenfont/BLF_translation.h | 2 | ||||
| -rw-r--r-- | source/blender/blenfont/intern/blf.c | 6 | ||||
| -rw-r--r-- | source/blender/blenfont/intern/blf_internal_types.h | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/source/blender/blenfont/BLF_translation.h b/source/blender/blenfont/BLF_translation.h index 8a99f486783..197809426ae 100644 --- a/source/blender/blenfont/BLF_translation.h +++ b/source/blender/blenfont/BLF_translation.h @@ -112,7 +112,7 @@ const char *BLF_translate_do_tooltip(const char *msgctxt, const char *msgid); /* Default, void context. * WARNING! The "" context is not the same as no (NULL) context at mo/boost::locale level! - * NOTE: We translate BLF_I18NCONTEXT_DEFAULT as BLF_I18NCONTEXT_DEFAULT_BPY in Python, as we can’t use "natural" + * NOTE: We translate BLF_I18NCONTEXT_DEFAULT as BLF_I18NCONTEXT_DEFAULT_BPY in Python, as we can't use "natural" * None value in rna string properties... :/ * For perf reason, we only use the first char to detect this context, so other contexts should never start * with the same char! diff --git a/source/blender/blenfont/intern/blf.c b/source/blender/blenfont/intern/blf.c index 16756769675..061e8e28607 100644 --- a/source/blender/blenfont/intern/blf.c +++ b/source/blender/blenfont/intern/blf.c @@ -43,6 +43,8 @@ #include "DNA_listBase.h" #include "DNA_vec_types.h" +#include "BLI_math.h" + #include "BIF_gl.h" #include "BLF_api.h" @@ -516,8 +518,8 @@ static void blf_draw__start(FontBLF *font, GLint *mode, GLint *param) if (font->flags & BLF_ASPECT) glScalef(font->aspect[0], font->aspect[1], font->aspect[2]); - if (font->flags & BLF_ROTATION) - glRotatef(font->angle, 0.0f, 0.0f, 1.0f); + if (font->flags & BLF_ROTATION) /* radians -> degrees */ + glRotatef(font->angle * (float)(180.0 / M_PI), 0.0f, 0.0f, 1.0f); if (font->shadow || font->blur) glGetFloatv(GL_CURRENT_COLOR, font->orig_col); diff --git a/source/blender/blenfont/intern/blf_internal_types.h b/source/blender/blenfont/intern/blf_internal_types.h index 1acc3dad4cf..de6e70e4461 100644 --- a/source/blender/blenfont/intern/blf_internal_types.h +++ b/source/blender/blenfont/intern/blf_internal_types.h @@ -166,7 +166,7 @@ typedef struct FontBLF { /* initial position for draw the text. */ float pos[3]; - /* angle in degrees. */ + /* angle in radians. */ float angle; /* blur: 3 or 5 large kernel */ |