diff options
| author | Antony Riakiotakis <kalast@gmail.com> | 2015-05-04 18:35:23 +0300 |
|---|---|---|
| committer | Antony Riakiotakis <kalast@gmail.com> | 2015-05-04 18:35:23 +0300 |
| commit | b97214a0ba1615f5a699150736ae3e99986707f4 (patch) | |
| tree | 52faa8a9efcb755d59f78e87e5993b4356cab1aa /source/blender/editors/space_sequencer/sequencer_draw.c | |
| parent | dc7d07753f537a89068dd770a7b264f8cbbb6d47 (diff) | |
Forgot this last merge
Diffstat (limited to 'source/blender/editors/space_sequencer/sequencer_draw.c')
| -rw-r--r-- | source/blender/editors/space_sequencer/sequencer_draw.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/source/blender/editors/space_sequencer/sequencer_draw.c b/source/blender/editors/space_sequencer/sequencer_draw.c index 066817dfb5d..113a6af2d8b 100644 --- a/source/blender/editors/space_sequencer/sequencer_draw.c +++ b/source/blender/editors/space_sequencer/sequencer_draw.c @@ -1336,7 +1336,6 @@ void draw_image_seq(const bContext *C, Scene *scene, ARegion *ar, SpaceSeq *sseq glTexCoord2f(1.0f, 0.0f); glVertex2f(v2d->tot.xmax, v2d->tot.ymin); } } -<<<<<<< HEAD else if (draw_overdrop) { float imagex = (scene->r.size * scene->r.xsch) / 200.0f * sseq->overdrop_zoom; float imagey = (scene->r.size * scene->r.ysch) / 200.0f * sseq->overdrop_zoom; |