diff options
| author | Diego Borghetti <bdiego@gmail.com> | 2009-05-06 03:10:32 +0400 |
|---|---|---|
| committer | Diego Borghetti <bdiego@gmail.com> | 2009-05-06 03:10:32 +0400 |
| commit | 405cf80eb8dc2df8ae160aee70aef34052add24a (patch) | |
| tree | f03cc27e95bdf91b25ea9d2a0dffb28ccef666be /source/blender/editors/interface/view2d.c | |
| parent | 71c38978e14ebf3522fe60fc239ad04f10ef30ab (diff) | |
Big, big commit!!
1) Remove WITH_FREETYPE2 from code, so now blender always need freetype2
2) Remove the old bmfont
3) Remove ftfont and bFTGL library
4) Implement a new BLF_draw_default function for place that still need/use
the old BMF api.
I try to update both, scons and cmake, but I only can test with make, so
hope all work fine.
MSVC is broken, but I don't have Windows, things to search and fix are
any reference to WITH_FREETYPE2, FTGL and BMFONT (take in care that
blenkernel also have a BKE_bmfont.h, this don't have anything to do with bmfont).
Always have to link/include the freetype2 library
Remove any reference to libbmfont
Remove any reference to libftfont
Remove any reference to libbftgl (or libbFTGL)
Diffstat (limited to 'source/blender/editors/interface/view2d.c')
| -rw-r--r-- | source/blender/editors/interface/view2d.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/source/blender/editors/interface/view2d.c b/source/blender/editors/interface/view2d.c index 3b503f00fd3..6107aa4ccc8 100644 --- a/source/blender/editors/interface/view2d.c +++ b/source/blender/editors/interface/view2d.c @@ -49,8 +49,6 @@ #include "ED_screen.h" -#include "BMF_Api.h" - #include "UI_interface.h" #include "UI_resources.h" #include "UI_view2d.h" @@ -1391,8 +1389,7 @@ static void scroll_printstr(View2DScrollers *scrollers, Scene *scene, float x, f } /* draw it */ - glRasterPos2f(x, y); - BMF_DrawString(G.fonts, str); // XXX check this again when new text-drawing api is done + BLF_draw_default(x, y, 0.0f, str); } /* local defines for scrollers drawing */ |