diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-04-29 16:07:27 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-04-29 16:07:27 +0400 |
| commit | b2136cab0b5ffd9166bd80af51dcbd0204217ac1 (patch) | |
| tree | 26ea3e177e559d2ce7541c24429785560563692c /source/blender/blenfont | |
| parent | 26963d65d8a4f7851c29deb0e6f7976ac1498134 (diff) | |
don't use GPU_extensions for BLF, its not initialized when using the blender-playanim and not really needed.
this reverts part of 55995
Diffstat (limited to 'source/blender/blenfont')
| -rw-r--r-- | source/blender/blenfont/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | source/blender/blenfont/SConscript | 1 | ||||
| -rw-r--r-- | source/blender/blenfont/intern/blf_glyph.c | 3 |
3 files changed, 1 insertions, 4 deletions
diff --git a/source/blender/blenfont/CMakeLists.txt b/source/blender/blenfont/CMakeLists.txt index 936dd708cfb..7bb80c34323 100644 --- a/source/blender/blenfont/CMakeLists.txt +++ b/source/blender/blenfont/CMakeLists.txt @@ -31,7 +31,6 @@ set(INC ../makesrna ../python ../imbuf - ../gpu ../../../intern/guardedalloc ../../../intern/locale ) diff --git a/source/blender/blenfont/SConscript b/source/blender/blenfont/SConscript index f70bdfa7a06..3529330a308 100644 --- a/source/blender/blenfont/SConscript +++ b/source/blender/blenfont/SConscript @@ -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'] diff --git a/source/blender/blenfont/intern/blf_glyph.c b/source/blender/blenfont/intern/blf_glyph.c index 142acf755fc..a6b04b24399 100644 --- a/source/blender/blenfont/intern/blf_glyph.c +++ b/source/blender/blenfont/intern/blf_glyph.c @@ -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); |