blender
/
blender
128
396
Fork 569
Code Issues 6.2k Pull Requests 757 Projects 19 Wiki Activity

Fix timeline break after recent immediate mode change (rBf6e7e46f)

This commit is contained in:
Dalai Felinto 2016-10-13 02:19:04 +00:00
parent b5c539f9fa
commit 165bdfb672
1 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
source/blender/editors/space_time/space_time.c
View File

@ -212,24 +212,27 @@ static void time_draw_idblock_keyframes(View2D *v2d, ID *id, short onlysel, cons
max_len++;
}
VertexFormat *format = immVertexFormat();
unsigned pos = add_attrib(format, "pos", GL_FLOAT, 2, KEEP_FLOAT);
if (max_len > 0) {
immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
immUniformColor3ubv(color);
VertexFormat *format = immVertexFormat();
unsigned pos = add_attrib(format, "pos", GL_FLOAT, 2, KEEP_FLOAT);
immBeginAtMost(GL_LINES, max_len * 2.0f);
immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
immUniformColor3ubv(color);
for (;(ak) && (ak->cfra <= v2d->cur.xmax);
ak = ak->next)
{
immVertex2f(pos, ak->cfra, ymin);
immVertex2f(pos, ak->cfra, ymax);
immBeginAtMost(GL_LINES, max_len * 2.0f);
for (; (ak) && (ak->cfra <= v2d->cur.xmax);
ak = ak->next)
{
immVertex2f(pos, ak->cfra, ymin);
immVertex2f(pos, ak->cfra, ymax);
}
immEnd();
immUnbindProgram();
}
immEnd();
immUnbindProgram();
/* free temp stuff */
BLI_dlrbTree_free(&keys);
}