From 62a12a16a2a494bed152d768f0dae89a4dad37de Mon Sep 17 00:00:00 2001 From: Neil Roberts Date: Mon, 6 Dec 2010 21:14:33 +0000 Subject: [PATCH] cogl-pipeline: Fix the layer_has_alpha_cb _cogl_pipeline_needs_blending_enabled tries to determine whether each layer is using the default combine state. However it was using argument 0 for both checks so the if-statement would never be true. --- cogl/cogl-pipeline.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cogl/cogl-pipeline.c b/cogl/cogl-pipeline.c index 4dd369c0d..5dbcedc3b 100644 --- a/cogl/cogl-pipeline.c +++ b/cogl/cogl-pipeline.c @@ -749,8 +749,8 @@ layer_has_alpha_cb (CoglPipelineLayer *layer, void *data) if (big_state->texture_combine_alpha_func != GL_MODULATE || big_state->texture_combine_alpha_src[0] != GL_PREVIOUS || big_state->texture_combine_alpha_op[0] != GL_SRC_ALPHA || - big_state->texture_combine_alpha_src[0] != GL_TEXTURE || - big_state->texture_combine_alpha_op[0] != GL_SRC_ALPHA) + big_state->texture_combine_alpha_src[1] != GL_TEXTURE || + big_state->texture_combine_alpha_op[1] != GL_SRC_ALPHA) { *has_alpha = TRUE; /* return FALSE to stop iterating layers... */