[Bf-blender-cvs] [b97214a] gooseberry: Forgot this last merge

Antony Riakiotakis noreply at git.blender.org
Mon May 4 17:40:56 CEST 2015


Commit: b97214a0ba1615f5a699150736ae3e99986707f4
Author: Antony Riakiotakis
Date:   Mon May 4 17:35:23 2015 +0200
Branches: gooseberry
https://developer.blender.org/rBb97214a0ba1615f5a699150736ae3e99986707f4

Forgot this last merge

===================================================================

M	source/blender/editors/space_sequencer/sequencer_draw.c

===================================================================

diff --git a/source/blender/editors/space_sequencer/sequencer_draw.c b/source/blender/editors/space_sequencer/sequencer_draw.c
index 066817d..113a6af 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;




More information about the Bf-blender-cvs mailing list