* clutter/clutter-main.c (_clutter_do_pick): Restore the GL_DITHER

state after reading the pixel value instead of before. Suggested
	in bug 1328 thanks to Guy Zadickario.
This commit is contained in:
Neil Roberts 2008-12-08 12:02:36 +00:00
parent 2410f74e29
commit 008693d8b2
2 changed files with 9 additions and 3 deletions

View File

@ -1,3 +1,9 @@
2008-12-08 Neil Roberts <neil@linux.intel.com>
* clutter/clutter-main.c (_clutter_do_pick): Restore the GL_DITHER
state after reading the pixel value instead of before. Suggested
in bug 1328 thanks to Guy Zadickario.
2008-12-05 Emmanuele Bassi <ebassi@linux.intel.com> 2008-12-05 Emmanuele Bassi <ebassi@linux.intel.com>
Bug 1309 - clutter_timeline_new and clutter_timeline_set_speed Bug 1309 - clutter_timeline_new and clutter_timeline_set_speed

View File

@ -386,13 +386,13 @@ _clutter_do_pick (ClutterStage *stage,
*/ */
glFinish(); glFinish();
/* Read the color of the screen co-ords pixel */
glReadPixels (x, viewport[3] - y -1, 1, 1, GL_RGBA, GL_UNSIGNED_BYTE, pixel);
/* Restore whether GL_DITHER was enabled */ /* Restore whether GL_DITHER was enabled */
if (dither_was_on) if (dither_was_on)
glEnable (GL_DITHER); glEnable (GL_DITHER);
/* Read the color of the screen co-ords pixel */
glReadPixels (x, viewport[3] - y -1, 1, 1, GL_RGBA, GL_UNSIGNED_BYTE, pixel);
if (pixel[0] == 0xff && pixel[1] == 0xff && pixel[2] == 0xff) if (pixel[0] == 0xff && pixel[1] == 0xff && pixel[2] == 0xff)
return CLUTTER_ACTOR (stage); return CLUTTER_ACTOR (stage);