diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-04-01 12:03:25 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-04-01 12:03:25 +0300 |
commit | b65ea517eb932bde950bde51979c6a3fd258efa8 (patch) | |
tree | 8f3a291a7e1778bb3af45cdb1d98a621efbd1a7d /source/blender/blenfont/intern/blf_internal_types.h | |
parent | 916c91bd08933d596eaca3e369467daf7964612e (diff) | |
parent | 473f17b3d557adbb06b89e0a186be48a0129086d (diff) |
Merge branch 'master' into blender2.8
- Undo that changes modes currently asserts,
since undo is now screen data.
Most likely we will change how object mode and workspaces work
since it's not practical/maintainable at the moment.
- Removed view_layer from particle settings
(wasn't needed and complicated undo).
Diffstat (limited to 'source/blender/blenfont/intern/blf_internal_types.h')
-rw-r--r-- | source/blender/blenfont/intern/blf_internal_types.h | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/source/blender/blenfont/intern/blf_internal_types.h b/source/blender/blenfont/intern/blf_internal_types.h index a34541f62bf..af2dc8a66e9 100644 --- a/source/blender/blenfont/intern/blf_internal_types.h +++ b/source/blender/blenfont/intern/blf_internal_types.h @@ -80,33 +80,33 @@ typedef struct GlyphCacheBLF { unsigned int *textures; /* size of the array. */ - unsigned int ntex; + unsigned int textures_len; /* and the last texture, aka. the current texture. */ - unsigned int cur_tex; + unsigned int texture_current; /* like bftgl, we draw every glyph in a big texture, so this is the * current position inside the texture. */ - int x_offs; - int y_offs; + int offset_x; + int offset_y; /* and the space from one to other. */ int pad; /* and the bigger glyph in the font. */ - int max_glyph_width; - int max_glyph_height; + int glyph_width_max; + int glyph_height_max; /* next two integer power of two, to build the texture. */ int p2_width; int p2_height; /* number of glyphs in the font. */ - int num_glyphs; + int glyphs_len_max; - /* number of glyphs that we load here. */ - int rem_glyphs; + /* number of glyphs not yet loaded (decreases every glyph loaded). */ + int glyphs_len_free; /* ascender and descender value. */ float ascender; @@ -135,8 +135,8 @@ typedef struct GlyphBLF { unsigned int tex; /* position inside the texture where this glyph is store. */ - int xoff; - int yoff; + int offset_x; + int offset_y; /* Bitmap data, from freetype. Take care that this * can be NULL. @@ -159,7 +159,7 @@ typedef struct GlyphBLF { float pos_y; /* with value of zero mean that we need build the texture. */ - short build_tex; + char build_tex; } GlyphBLF; typedef struct FontBufInfoBLF { @@ -240,7 +240,7 @@ typedef struct FontBLF { unsigned int size; /* max texture size. */ - int max_tex_size; + int tex_size_max; /* cache current OpenGL texture to save calls into the API */ unsigned int tex_bind_state; @@ -284,6 +284,6 @@ typedef struct DirBLF { char *path; } DirBLF; -#define BLF_CURTEX_UNSET ((unsigned int)-1) +#define BLF_TEXTURE_UNSET ((unsigned int)-1) #endif /* __BLF_INTERNAL_TYPES_H__ */ |