Merge branch 'master' into cogl-material

Conflicts:

	clutter/cogl/gl/cogl-context.c
	clutter/cogl/gl/cogl-context.h

diff --cc clutter/cogl/cogl-texture.h
Simple merge

diff --cc clutter/cogl/gl/cogl-context.c
index 84e46bc,35af840..9283ad6
--- 1/clutter/cogl/gl/cogl-context.c
--- 2/clutter/cogl/gl/cogl-context.c
+++ b/clutter/cogl/gl/cogl-context.c
@@@ -59,13 -59,9 +59,13 @@@ cogl_create_context (
    _context->texture_vertices_size = 0;
    _context->texture_vertices = NULL;
  
-   
 +  _context->material_handles = NULL;
 +  _context->material_layer_handles = NULL;
 +  _context->source_material = NULL;
++
    _context->fbo_handles = NULL;
    _context->draw_buffer = COGL_WINDOW_BUFFER;
-   
+ 
    _context->blend_src_factor = CGL_SRC_ALPHA;
    _context->blend_dst_factor = CGL_ONE_MINUS_SRC_ALPHA;
  

diff --cc clutter/cogl/gl/cogl-context.h
index 81ec932,172035d..3eb00e1
--- 1/clutter/cogl/gl/cogl-context.h
--- 2/clutter/cogl/gl/cogl-context.h
+++ b/clutter/cogl/gl/cogl-context.h
@@@ -65,12 -65,7 +65,12 @@@ typedef struc
    GArray            *texture_handles;
    CoglTextureGLVertex *texture_vertices;
    gulong               texture_vertices_size;
-   
+ 
 +  /* Materials */
 +  GArray           *material_handles;
 +  GArray           *material_layer_handles;
 +  CoglHandle      source_material;
 +
    /* Framebuffer objects */
    GArray           *fbo_handles;
    CoglBufferTarget  draw_buffer;

diff --cc clutter/cogl/gl/cogl-texture.c
Simple merge