forked from bartvdbraak/blender
don't use GPU_extensions for BLF, its not initialized when using the blender-playanim and not really needed.
this reverts part of 55995
This commit is contained in:
parent
26963d65d8
commit
b2136cab0b
@ -31,7 +31,6 @@ set(INC
|
|||||||
../makesrna
|
../makesrna
|
||||||
../python
|
../python
|
||||||
../imbuf
|
../imbuf
|
||||||
../gpu
|
|
||||||
../../../intern/guardedalloc
|
../../../intern/guardedalloc
|
||||||
../../../intern/locale
|
../../../intern/locale
|
||||||
)
|
)
|
||||||
|
@ -33,7 +33,6 @@ sources = env.Glob('intern/*.c')
|
|||||||
incs = '. intern #/intern/guardedalloc #/intern/locale ../blenkernel ../blenlib ../blenloader'
|
incs = '. intern #/intern/guardedalloc #/intern/locale ../blenkernel ../blenlib ../blenloader'
|
||||||
incs += ' ../makesdna ../makesrna ../python ../imbuf ../editors/include'
|
incs += ' ../makesdna ../makesrna ../python ../imbuf ../editors/include'
|
||||||
incs += ' #/extern/glew/include'
|
incs += ' #/extern/glew/include'
|
||||||
incs += ' ../gpu'
|
|
||||||
incs += ' ' + env['BF_FREETYPE_INC']
|
incs += ' ' + env['BF_FREETYPE_INC']
|
||||||
|
|
||||||
defs = ['GLEW_STATIC']
|
defs = ['GLEW_STATIC']
|
||||||
|
@ -55,7 +55,6 @@
|
|||||||
#include "blf_internal_types.h"
|
#include "blf_internal_types.h"
|
||||||
#include "blf_internal.h"
|
#include "blf_internal.h"
|
||||||
|
|
||||||
#include "GPU_extensions.h"
|
|
||||||
|
|
||||||
GlyphCacheBLF *blf_glyph_cache_find(FontBLF *font, int size, int dpi)
|
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;
|
GlyphCacheBLF *gc = font->glyph_cache;
|
||||||
|
|
||||||
if (font->max_tex_size == -1)
|
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) {
|
if (gc->cur_tex == -1) {
|
||||||
blf_glyph_cache_texture(font, gc);
|
blf_glyph_cache_texture(font, gc);
|
||||||
|
Loading…
Reference in New Issue
Block a user