Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDalai Felinto <dfelinto@gmail.com>2016-10-13 17:17:52 +0300
committerDalai Felinto <dfelinto@gmail.com>2016-10-13 17:18:47 +0300
commit35793504815a1cd0eb38df54d9ae99cc441b4f2f (patch)
tree2991d9c66477991d13a15362cb2fd569e8d329e3 /source/blender/editors/space_time
parent6f220c1c55fd2cd4692ff017ccb2b0e6b28c6d3f (diff)
immediate mode: small cleanup on timeline
(no need to unbind/rebind the same program)
Diffstat (limited to 'source/blender/editors/space_time')
-rw-r--r--source/blender/editors/space_time/space_time.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/source/blender/editors/space_time/space_time.c b/source/blender/editors/space_time/space_time.c
index 8b54d26dc74..f199820dd10 100644
--- a/source/blender/editors/space_time/space_time.c
+++ b/source/blender/editors/space_time/space_time.c
@@ -96,12 +96,9 @@ static void time_draw_sfra_efra(Scene *scene, View2D *v2d)
immRectf(pos, v2d->cur.xmin, v2d->cur.ymin, v2d->cur.xmax, v2d->cur.ymax);
}
- immUnbindProgram();
-
glDisable(GL_BLEND);
/* thin lines where the actual frames are */
- immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
immUniformThemeColorShade(TH_BACK, -60);
immBegin(GL_LINES, 4);
@@ -220,7 +217,7 @@ static void time_draw_idblock_keyframes(View2D *v2d, ID *id, short onlysel, cons
immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
immUniformColor3ubv(color);
- immBeginAtMost(GL_LINES, max_len * 2.0f);
+ immBeginAtMost(GL_LINES, max_len * 2);
for (; (ak) && (ak->cfra <= v2d->cur.xmax);
ak = ak->next)