[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [56346] trunk/blender/source/blender/ editors/space_sequencer/sequencer_draw.c: Solve possible uninitialized variables usage in sequencer draw function

Sergey Sharybin sergey.vfx at gmail.com
Sat Apr 27 20:21:17 CEST 2013


Revision: 56346
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56346
Author:   nazgul
Date:     2013-04-27 18:21:16 +0000 (Sat, 27 Apr 2013)
Log Message:
-----------
Solve possible uninitialized variables usage in sequencer draw function

Modified Paths:
--------------
    trunk/blender/source/blender/editors/space_sequencer/sequencer_draw.c

Modified: trunk/blender/source/blender/editors/space_sequencer/sequencer_draw.c
===================================================================
--- trunk/blender/source/blender/editors/space_sequencer/sequencer_draw.c	2013-04-27 17:50:11 UTC (rev 56345)
+++ trunk/blender/source/blender/editors/space_sequencer/sequencer_draw.c	2013-04-27 18:21:16 UTC (rev 56346)
@@ -1063,11 +1063,14 @@
 		bool force_fallback = false;
 
 		force_fallback |= !ELEM(U.image_draw_method, IMAGE_DRAW_METHOD_AUTO, IMAGE_DRAW_METHOD_GLSL);
-		force_fallback |= ibuf->dither != 0.0f;
+		force_fallback |= (ibuf->dither != 0.0f);
 
 		if (force_fallback) {
 			/* Fallback to CPU based color space conversion */
 			glsl_used = false;
+			format = GL_RGBA;
+			type = GL_UNSIGNED_BYTE;
+			display_buffer = NULL;
 		}
 		else if (ibuf->rect_float) {
 			display_buffer = ibuf->rect_float;




More information about the Bf-blender-cvs mailing list