diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2015-07-14 15:27:25 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2015-07-14 15:36:00 +0300 |
| commit | 0918461d61127f5d7e9dd7d81441a77b4bdd962d (patch) | |
| tree | 256a28c9b586ab8588797bc3e63dec31f485bff8 /source/blender/gpu/GPU_draw.h | |
| parent | 2cffd6649b0e9b646bc090e4bba90e9873fb2982 (diff) | |
Move from MTFace to MTexPoly w/ texture checks
Part of moving away from MFace.
Diffstat (limited to 'source/blender/gpu/GPU_draw.h')
| -rw-r--r-- | source/blender/gpu/GPU_draw.h | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/source/blender/gpu/GPU_draw.h b/source/blender/gpu/GPU_draw.h index 845ae9d2b30..2e160683618 100644 --- a/source/blender/gpu/GPU_draw.h +++ b/source/blender/gpu/GPU_draw.h @@ -39,7 +39,7 @@ extern "C" { struct ImBuf; struct Image; struct ImageUser; -struct MTFace; +struct MTexPoly; struct Object; struct Scene; struct View3D; @@ -83,7 +83,7 @@ int GPU_get_material_alpha_blend(void); * be drawn using one or the other * - passing NULL clears the state again */ -int GPU_set_tpage(struct MTFace *tface, int mipmap, int transp); +int GPU_set_tpage(struct MTexPoly *mtexpoly, int mipmap, int transp); void GPU_clear_tpage(bool force); /* Lights @@ -97,9 +97,11 @@ int GPU_scene_object_lights(struct Scene *scene, struct Object *ob, /* Text render * - based on moving uv coordinates */ -void GPU_render_text(struct MTFace *tface, int mode, - const char *textstr, int textlen, unsigned int *col, - float *v1, float *v2, float *v3, float *v4, int glattrib); +void GPU_render_text( + struct MTexPoly *mtexpoly, int mode, + const char *textstr, int textlen, unsigned int *col, + const float *v_quad[4], const float *uv_quad[4], + int glattrib); /* Mipmap settings * - these will free textures on changes */ |