From f27c6f313955b737888ce80752ee9cd895562d40 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Fri, 16 May 2008 15:17:35 -0600 Subject: fix merge collision --- src/mesa/tnl/t_vp_build.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'src') diff --git a/src/mesa/tnl/t_vp_build.c b/src/mesa/tnl/t_vp_build.c index 4432893f17..46446d4885 100644 --- a/src/mesa/tnl/t_vp_build.c +++ b/src/mesa/tnl/t_vp_build.c @@ -1572,11 +1572,9 @@ void _tnl_UpdateFixedFunctionProgram( GLcontext *ctx ) cache_item(ctx, tnl->vp_cache, hash, key, newProg); _mesa_reference_vertprog(ctx, &ctx->VertexProgram._TnlProgram, newProg); - } else { - FREE(key); } else { - FREE(key); + FREE(key); } _mesa_reference_vertprog(ctx, &ctx->VertexProgram._TnlProgram, newProg); -- cgit v1.2.3