diff options
| author | Mike Erwin <significant.bit@gmail.com> | 2017-04-06 07:59:04 +0300 |
|---|---|---|
| committer | Mike Erwin <significant.bit@gmail.com> | 2017-04-06 08:18:12 +0300 |
| commit | 0debbe2b7f7177678c9bce9046c1499b698ac969 (patch) | |
| tree | 9a1fb242aae9be44b3479d2a747411b6e0c04822 /source/blender/editors/animation/anim_draw.c | |
| parent | c2f5cd8f6454bf8256a39a5fc9cb075311e25c58 (diff) | |
Gawain: VertexFormat_add_attrib (function name change)
See intern/gawain for the API change. Other files are updated to use the new name. Also updated every call site to the recommended style:
unsigned int foo = VertexFormat_add_attrib(format, "foo", COMP_ ... )
Diffstat (limited to 'source/blender/editors/animation/anim_draw.c')
| -rw-r--r-- | source/blender/editors/animation/anim_draw.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/editors/animation/anim_draw.c b/source/blender/editors/animation/anim_draw.c index caa4a6e31f3..398bb225fbf 100644 --- a/source/blender/editors/animation/anim_draw.c +++ b/source/blender/editors/animation/anim_draw.c @@ -73,7 +73,7 @@ static void draw_cfra_number(Scene *scene, View2D *v2d, const float cfra, const { const uiFontStyle *fstyle = UI_FSTYLE_WIDGET; VertexFormat *format = immVertexFormat(); - unsigned int pos = add_attrib(format, "pos", GL_FLOAT, 2, KEEP_FLOAT); + unsigned int pos = VertexFormat_add_attrib(format, "pos", COMP_F32, 2, KEEP_FLOAT); unsigned char col[4]; float xscale, x, y; char numstr[32] = " t"; /* t is the character to start replacing from */ @@ -129,7 +129,7 @@ void ANIM_draw_cfra(const bContext *C, View2D *v2d, short flag) glLineWidth((flag & DRAWCFRA_WIDE) ? 3.0 : 2.0); VertexFormat *format = immVertexFormat(); - unsigned pos = add_attrib(format, "pos", GL_FLOAT, 2, KEEP_FLOAT); + unsigned int pos = VertexFormat_add_attrib(format, "pos", COMP_F32, 2, KEEP_FLOAT); immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR); @@ -164,7 +164,7 @@ void ANIM_draw_previewrange(const bContext *C, View2D *v2d, int end_frame_width) glEnable(GL_BLEND); VertexFormat *format = immVertexFormat(); - unsigned pos = add_attrib(format, "pos", GL_FLOAT, 2, KEEP_FLOAT); + unsigned int pos = VertexFormat_add_attrib(format, "pos", COMP_F32, 2, KEEP_FLOAT); immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR); immUniformColor4f(0.0f, 0.0f, 0.0f, 0.4f); |