sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

don't use GPU_extensions for BLF, its not initialized when using the blender-playanim and not really needed.

Browse Source 
this reverts part of 55995
This commit is contained in:
Campbell Barton 2013-04-29 12:07:27 +00:00
parent 26963d65d8
commit b2136cab0b
3 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
source/blender/blenfont/CMakeLists.txt
View File

@ -31,7 +31,6 @@ set(INC
../makesrna
../python
../imbuf
../gpu
../../../intern/guardedalloc
../../../intern/locale
)

1
source/blender/blenfont/SConscript
View File

@ -33,7 +33,6 @@ sources = env.Glob('intern/*.c')
incs = '. intern #/intern/guardedalloc #/intern/locale ../blenkernel ../blenlib ../blenloader'
incs += ' ../makesdna ../makesrna ../python ../imbuf ../editors/include'
incs += ' #/extern/glew/include'
incs += ' ../gpu'
incs += ' ' + env['BF_FREETYPE_INC']
defs = ['GLEW_STATIC']

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

@ -55,7 +55,6 @@
#include "blf_internal_types.h"
#include "blf_internal.h"
#include "GPU_extensions.h"
GlyphCacheBLF *blf_glyph_cache_find(FontBLF *font, int size, int dpi)
{
@ -382,7 +381,7 @@ int blf_glyph_render(FontBLF *font, GlyphBLF *g, float x, float y)
GlyphCacheBLF *gc = font->glyph_cache;
if (font->max_tex_size == -1)
font->max_tex_size = GPU_max_texture_size();
glGetIntegerv(GL_MAX_TEXTURE_SIZE, (GLint *)&font->max_tex_size);
if (gc->cur_tex == -1) {
blf_glyph_cache_texture(font, gc);