[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [56291] trunk/blender/source/blender/ editors/screen/glutil.c: Fix #35074: Image editor shows color banding on rendered images ( even with dither set to 2.0)

[Sergey Sharybin]

Revision: 56291
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56291
Author:   nazgul
Date:     2013-04-25 12:02:56 +0000 (Thu, 25 Apr 2013)
Log Message:
-----------
Fix #35074: Image editor shows color banding on rendered images (even with dither set to 2.0)

Mistake in one of changes to GLSL display function,
missed fallback mode in case dither is non-zero,

Modified Paths:
--------------
    trunk/blender/source/blender/editors/screen/glutil.c

Modified: trunk/blender/source/blender/editors/screen/glutil.c
===================================================================
--- trunk/blender/source/blender/editors/screen/glutil.c	2013-04-25 11:46:07 UTC (rev 56290)
+++ trunk/blender/source/blender/editors/screen/glutil.c	2013-04-25 12:02:56 UTC (rev 56291)
@@ -1043,15 +1043,15 @@
 		return;
 
 	/* Dithering is not supported on GLSL yet */
-	// force_fallback = ibuf->dither != 0.0f;
+	force_fallback |= ibuf->dither != 0.0f;
 
 	/* Single channel images could not be transformed using GLSL yet */
-	// force_fallback = ibuf->channels == 1;
+	force_fallback |= ibuf->channels == 1;
 
 	/* If user decided not to use GLSL, fallback to glaDrawPixelsAuto */
-	force_fallback = !ELEM(U.image_draw_method,
-	                       IMAGE_DRAW_METHOD_AUTO,
-	                       IMAGE_DRAW_METHOD_GLSL);
+	force_fallback |= !ELEM(U.image_draw_method,
+	                        IMAGE_DRAW_METHOD_AUTO,
+	                        IMAGE_DRAW_METHOD_GLSL);
 
 	/* This is actually lots of crap, but currently not sure about
 	 * more clear way to bypass partial buffer update crappyness