From 8ac3cb29ea6a04f434887c4e7a441ae4a4e67729 Mon Sep 17 00:00:00 2001 From: Robert Bragg Date: Fri, 6 Aug 2010 14:12:22 +0100 Subject: [PATCH] material: only deference layer->texture for authority In _cogl_material_layer_pre_paint we were mistakenly dereferencing the layer->texture member for the passed layer instead of dereferencing the texture state authority which was causing crashes in some cases. --- clutter/cogl/cogl/cogl-material.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/clutter/cogl/cogl/cogl-material.c b/clutter/cogl/cogl/cogl-material.c index 853e55ab8..40bbd7ece 100644 --- a/clutter/cogl/cogl/cogl-material.c +++ b/clutter/cogl/cogl/cogl-material.c @@ -4931,7 +4931,7 @@ _cogl_material_layer_pre_paint (CoglMaterialLayer *layer) || min_filter == COGL_MATERIAL_FILTER_LINEAR_MIPMAP_LINEAR) flags |= COGL_TEXTURE_NEEDS_MIPMAP; - _cogl_texture_pre_paint (layer->texture, flags); + _cogl_texture_pre_paint (texture_authority->texture, flags); } }