Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'source/blender/blenfont/intern/blf.c')
-rw-r--r--source/blender/blenfont/intern/blf.c23
1 files changed, 12 insertions, 11 deletions
diff --git a/source/blender/blenfont/intern/blf.c b/source/blender/blenfont/intern/blf.c
index 683ef3f821c..6857ec7874d 100644
--- a/source/blender/blenfont/intern/blf.c
+++ b/source/blender/blenfont/intern/blf.c
@@ -746,16 +746,17 @@ void BLF_shadow_offset(int fontid, int x, int y)
}
}
-void BLF_buffer(int fontid, float *fbuf, unsigned char *cbuf, int w, int h, int nch)
+void BLF_buffer(int fontid, float *fbuf, unsigned char *cbuf, int w, int h, int nch, int is_linear)
{
FontBLF *font = BLF_get(fontid);
if (font) {
- font->b_fbuf = fbuf;
- font->b_cbuf = cbuf;
- font->bw = w;
- font->bh = h;
- font->bch = nch;
+ font->buf_info.fbuf = fbuf;
+ font->buf_info.cbuf = cbuf;
+ font->buf_info.w = w;
+ font->buf_info.h = h;
+ font->buf_info.ch = nch;
+ font->buf_info.is_linear = is_linear;
}
}
@@ -764,10 +765,10 @@ void BLF_buffer_col(int fontid, float r, float g, float b, float a)
FontBLF *font = BLF_get(fontid);
if (font) {
- font->b_col[0] = r;
- font->b_col[1] = g;
- font->b_col[2] = b;
- font->b_col[3] = a;
+ font->buf_info.col[0] = r;
+ font->buf_info.col[1] = g;
+ font->buf_info.col[2] = b;
+ font->buf_info.col[3] = a;
}
}
@@ -775,7 +776,7 @@ void BLF_draw_buffer(int fontid, const char *str)
{
FontBLF *font = BLF_get(fontid);
- if (font && font->glyph_cache && (font->b_fbuf || font->b_cbuf)) {
+ if (font && font->glyph_cache && (font->buf_info.fbuf || font->buf_info.cbuf)) {
blf_font_buffer(font, str);
}
}