[Bf-blender-cvs] [6610bcb] gooseberry: Don't push merge without building first fix.

Antony Riakiotakis noreply at git.blender.org
Mon Mar 9 12:47:31 CET 2015


Commit: 6610bcb697231f304b7491dbdc025d66e0a2e282
Author: Antony Riakiotakis
Date:   Mon Mar 9 12:46:22 2015 +0100
Branches: gooseberry
https://developer.blender.org/rB6610bcb697231f304b7491dbdc025d66e0a2e282

Don't push merge without building first fix.

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

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 192adc5..317bc3a 100644
--- a/source/blender/editors/space_sequencer/sequencer_draw.c
+++ b/source/blender/editors/space_sequencer/sequencer_draw.c
@@ -1217,7 +1217,7 @@ void draw_image_seq(const bContext *C, Scene *scene, ARegion *ar, SpaceSeq *sseq
 	else
 		glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, ibuf->x, ibuf->y, 0, format, type, display_buffer);
 
-	if (draw_backdrop) {
+	if (draw_overdrop) {
 		UI_view2d_view_restore(C);
 	}
 	glBegin(GL_QUADS);




More information about the Bf-blender-cvs mailing list