From 499a370ee326ea24fd0fff55466877a6f286d9fd Mon Sep 17 00:00:00 2001 From: Neil Roberts Date: Tue, 30 Nov 2010 22:17:17 +0000 Subject: [PATCH] cogl-pipeline-opengl: Fix enabling previously disabled units When enabling a unit that was disabled from a previous flush pipeline it was forgetting to rebind the right texture unit so it wouldn't work. This was causing the redhand to disappear when using the fixed function backend in test-cogl-multitexture if anything else is added to the scene. --- clutter/cogl/cogl/cogl-pipeline-opengl.c | 1 + 1 file changed, 1 insertion(+) diff --git a/clutter/cogl/cogl/cogl-pipeline-opengl.c b/clutter/cogl/cogl/cogl-pipeline-opengl.c index 8d57bff78..049d0f795 100644 --- a/clutter/cogl/cogl/cogl-pipeline-opengl.c +++ b/clutter/cogl/cogl/cogl-pipeline-opengl.c @@ -725,6 +725,7 @@ flush_layers_common_gl_state_cb (CoglPipelineLayer *layer, void *user_data) if (!G_UNLIKELY (cogl_debug_flags & COGL_DEBUG_DISABLE_TEXTURING) && !unit->enabled) { + _cogl_set_active_texture_unit (unit_index); GE (glEnable (unit->current_gl_target)); unit->enabled = TRUE; }