diff options
| author | Clément Foucault <foucault.clem@gmail.com> | 2017-02-23 18:38:29 +0300 |
|---|---|---|
| committer | Clément Foucault <foucault.clem@gmail.com> | 2017-02-24 03:26:44 +0300 |
| commit | 071fdfbfb3ad51b83da57628d9336bbce5cb8a79 (patch) | |
| tree | 321dfcbbe288132de15c57330f3a72fea5b81c5e /source/blender/editors/space_clip/clip_dopesheet_draw.c | |
| parent | e4378412394caaf84215ae52af0a916b71804cd0 (diff) | |
OpenGL immediate mode: fix asserts in clip dopesheet
Diffstat (limited to 'source/blender/editors/space_clip/clip_dopesheet_draw.c')
| -rw-r--r-- | source/blender/editors/space_clip/clip_dopesheet_draw.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/space_clip/clip_dopesheet_draw.c b/source/blender/editors/space_clip/clip_dopesheet_draw.c index 872e62dbc97..14d2ca21b0a 100644 --- a/source/blender/editors/space_clip/clip_dopesheet_draw.c +++ b/source/blender/editors/space_clip/clip_dopesheet_draw.c @@ -216,7 +216,7 @@ void clip_draw_dopesheet_main(SpaceClip *sc, ARegion *ar, Scene *scene) format = immVertexFormat(); pos_id = add_attrib(format, "pos", COMP_F32, 2, KEEP_FLOAT); unsigned int size_id = add_attrib(format, "size", COMP_F32, 1, KEEP_FLOAT); - unsigned int color_id = add_attrib(format, "color", COMP_U8, 4, NORMALIZE_INT_TO_FLOAT); + unsigned int color_id = add_attrib(format, "color", COMP_F32, 4, KEEP_FLOAT); unsigned int outline_color_id = add_attrib(format, "outlineColor", COMP_U8, 4, NORMALIZE_INT_TO_FLOAT); immBindBuiltinProgram(GPU_SHADER_KEYFRAME_DIAMOND); @@ -225,7 +225,7 @@ void clip_draw_dopesheet_main(SpaceClip *sc, ARegion *ar, Scene *scene) /* all same size with black outline */ immAttrib1f(size_id, 2.0f * STRIP_HEIGHT_HALF); - immAttrib3ub(outline_color_id, 0, 0, 0); + immAttrib4ub(outline_color_id, 0, 0, 0, 255); y = (float) CHANNEL_FIRST; /* start again at the top */ for (channel = dopesheet->channels.first; channel; channel = channel->next) { |