diff options
author | Diego Borghetti <bdiego@gmail.com> | 2010-12-10 01:27:55 +0300 |
---|---|---|
committer | Diego Borghetti <bdiego@gmail.com> | 2010-12-10 01:27:55 +0300 |
commit | 545cc4803e8e9e7418aba98b2c1bec72fa629146 (patch) | |
tree | 3b3fb952f7ef2b6926bb3d990574c5f7f6a603e7 /source/blender/editors/interface/interface_style.c | |
parent | 3ee53d7b5f8e4371607467cff69c3f35662abdc4 (diff) |
Change the BLF_aspect function to handle 3d text.
This is need to properly handle 3d text (dalai work on GE), before
the BLF_aspect only take one argument, and the result was a call to:
glScalef(aspect, aspect, 1.0)
Now the three value are store in the font (x, y and z) and also
need to be enable using BLF_enable(BLF_ASPECT).
By default all the code that don't have BLF_ASPECT enable work with
a scale of 1.0 (so nothing change to the current UI).
I also remove all the call of BLF_aspect(fontid, 1.0) found in
the editors, because is disable by default, so no need any more.
Campbell the only thing to check is the python api, right now
I modify the api to from:
BLF_aspect(fontid, aspect)
to:
BLF_aspect(fontid, aspect, aspect, 1.0)
This is to avoid break the api, but now you need add the BLF_ASPECT
option to the function py_blf_enable and in some point change
py_blf_aspect to take 3 arguments.
Diffstat (limited to 'source/blender/editors/interface/interface_style.c')
-rw-r--r-- | source/blender/editors/interface/interface_style.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/source/blender/editors/interface/interface_style.c b/source/blender/editors/interface/interface_style.c index 51a54315d66..ec9ac300ca2 100644 --- a/source/blender/editors/interface/interface_style.c +++ b/source/blender/editors/interface/interface_style.c @@ -319,14 +319,12 @@ void uiStyleInit(void) if (blf_mono_font == -1) blf_mono_font= BLF_load_mem_unique("monospace", (unsigned char *)datatoc_bmonofont_ttf, datatoc_bmonofont_ttf_size); - BLF_aspect(blf_mono_font, 1.0); BLF_size(blf_mono_font, 12, 72); /* second for rendering else we get threading problems */ if (blf_mono_font_render == -1) blf_mono_font_render= BLF_load_mem_unique("monospace", (unsigned char *)datatoc_bmonofont_ttf, datatoc_bmonofont_ttf_size); - BLF_aspect(blf_mono_font_render, 1.0); BLF_size(blf_mono_font_render, 12, 72); } |