archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Bitmap mode is back.

Browse Source 
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.
This commit is contained in:
Diego Borghetti
2009-07-28 20:02:09 +00:00
parent b073fe336c
commit 4ad9dd7c8e
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/blenfont/intern/blf.c
View File

@@ -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]);

4
source/blender/blenfont/intern/blf_glyph.c
View File

@@ -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);
}

3
source/blender/editors/interface/interface_style.c
View File

@@ -248,6 +248,9 @@ void uiStyleInit(void)
BLF_size(11, U.dpi);
BLF_size(12, U.dpi);
BLF_size(14, U.dpi);
if (!(U.transopts & USER_USETEXTUREFONT))
BLF_mode(BLF_MODE_BITMAP);
}
}