Commit: 071fdfbfb3ad51b83da57628d9336bbce5cb8a79
Author: Clément Foucault
Date: Thu Feb 23 16:38:29 2017 +0100
Branches: blender2.8
https://developer.blender.org/rB071fdfbfb3ad51b83da57628d9336bbce5cb8a79
OpenGL immediate mode: fix asserts in clip dopesheet
===================================================================
M source/blender/editors/space_clip/clip_dopesheet_draw.c
===================================================================
diff --git a/source/blender/editors/space_clip/clip_dopesheet_draw.c
b/source/blender/editors/space_clip/clip_dopesheet_draw.c
index 872e62dbc9..14d2ca21b0 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) {
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
