From: Neil Roberts <neil@linux.intel.com>
Date: Mon, 1 Feb 2010 13:37:19 +0000 (+0000)
Subject: Merge remote branch 'master' into texture-debugging
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=145cc9d3dfd1dc51f254eefde35042fc20a6375e;p=profile%2Fivi%2Fclutter.git

Merge remote branch 'master' into texture-debugging

Conflicts:
	clutter/cogl/cogl/cogl-context.h
---

145cc9d3dfd1dc51f254eefde35042fc20a6375e
diff --cc clutter/cogl/cogl/cogl-context.h
index ce84b01,53c233c..dcbba2c
--- a/clutter/cogl/cogl/cogl-context.h
+++ b/clutter/cogl/cogl/cogl-context.h
@@@ -112,9 -111,12 +112,15 @@@ typedef struc
  
    CoglHandle        texture_download_material;
  
 +  CoglAtlas        *atlas;
 +  CoglHandle        atlas_texture;
 +
+   /* This debugging variable is used to pick a colour for visually
+      displaying the quad batches. It needs to be global so that it can
+      be reset by cogl_clear. It needs to be reset to increase the
+      chances of getting the same colour during an animation */
+   guint8            journal_rectangles_color;
+ 
    CoglContextDriver drv;
  } CoglContext;