diff options
author | Diego Borghetti <bdiego@gmail.com> | 2009-07-29 00:02:09 +0400 |
---|---|---|
committer | Diego Borghetti <bdiego@gmail.com> | 2009-07-29 00:02:09 +0400 |
commit | 4ad9dd7c8e359133bb3785810e6b7811afbc1abc (patch) | |
tree | 40354f3e506fb49bd8b53b474b3f34a4fed73792 /source/blender/blenfont | |
parent | b073fe336c5002af49187989da09c38c4ae0f8d0 (diff) |
Bitmap mode is back.
The option of Texture or Bitmap font is working again, yes it's really
uuuuugly right now, but it work.
On the next commit I go to put this at the same level that texture font.
Change this from User Preferences -> Language -> Textued Fonts, save
the preferences and run blender again.
Diffstat (limited to 'source/blender/blenfont')
-rw-r--r-- | source/blender/blenfont/intern/blf.c | 2 | ||||
-rw-r--r-- | source/blender/blenfont/intern/blf_glyph.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/blenfont/intern/blf.c b/source/blender/blenfont/intern/blf.c index cd7f969d5e5..af57f822c40 100644 --- a/source/blender/blenfont/intern/blf.c +++ b/source/blender/blenfont/intern/blf.c @@ -349,7 +349,7 @@ void BLF_draw(char *str) glPushClientAttrib(GL_CLIENT_PIXEL_STORE_BIT); glPushAttrib(GL_ENABLE_BIT); glPixelStorei(GL_UNPACK_LSB_FIRST, GL_FALSE); - glPixelStorei( GL_UNPACK_ALIGNMENT, 1); + glPixelStorei(GL_UNPACK_ALIGNMENT, 1); glDisable(GL_BLEND); glRasterPos3f(font->pos[0], font->pos[1], font->pos[2]); diff --git a/source/blender/blenfont/intern/blf_glyph.c b/source/blender/blenfont/intern/blf_glyph.c index d2767d6ffb1..9a3d91ac4e5 100644 --- a/source/blender/blenfont/intern/blf_glyph.c +++ b/source/blender/blenfont/intern/blf_glyph.c @@ -573,10 +573,10 @@ int blf_glyph_bitmap_render(FontBLF *font, GlyphBLF *g, float x, float y) return(0); } - glBitmap(0, 0, 0.0, 0.0, x + font->pos[0], y - font->pos[1], (const GLubyte *)&null_bitmap); + glBitmap(0, 0, 0.0, 0.0, x, y, (const GLubyte *)&null_bitmap); glPixelStorei(GL_UNPACK_ROW_LENGTH, gt->pitch * 8); glBitmap(gt->width, gt->height, 0.0, gt->pos_y, 0.0, 0.0, (const GLubyte *)gt->image); - glBitmap(0, 0, 0.0, 0.0, -x - font->pos[0], -y + font->pos[1], (const GLubyte *)&null_bitmap); + glBitmap(0, 0, 0.0, 0.0, -x, -y, (const GLubyte *)&null_bitmap); return(1); } |