diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2013-04-03 20:21:14 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2013-04-03 20:21:14 +0400 |
| commit | e6a16e585cd30aa540550b9ac76ba630daf03fe8 (patch) | |
| tree | b2b47b2da6f4e92625d9c6d7833225cfacc857b0 /source/blender/editors/space_clip | |
| parent | 743552ff2a4c1ce057934e0c5b22a0e48d08c749 (diff) | |
Apparently zoom in clip editor was broken
Also silenced some warnings in glutil.
Diffstat (limited to 'source/blender/editors/space_clip')
| -rw-r--r-- | source/blender/editors/space_clip/clip_draw.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/source/blender/editors/space_clip/clip_draw.c b/source/blender/editors/space_clip/clip_draw.c index 773d6031ee1..b4e2dc364d9 100644 --- a/source/blender/editors/space_clip/clip_draw.c +++ b/source/blender/editors/space_clip/clip_draw.c @@ -279,7 +279,13 @@ static void draw_movieclip_buffer(const bContext *C, SpaceClip *sc, ARegion *ar, filter = GL_NEAREST; } - glaDrawImBuf_glsl_ctx(C, ibuf, x, y, GL_NEAREST); + /* set zoom */ + glPixelZoom(zoomx * width / ibuf->x, zoomy * height / ibuf->y); + + glaDrawImBuf_glsl_ctx(C, ibuf, x, y, filter); + + /* reset zoom */ + glPixelZoom(1.0f, 1.0f); if (ibuf->planes == 32) glDisable(GL_BLEND); |