summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBrian Paul <brian.paul@tungstengraphics.com>2008-05-16 15:17:35 -0600
committerBrian Paul <brian.paul@tungstengraphics.com>2008-05-16 15:17:35 -0600
commitf27c6f313955b737888ce80752ee9cd895562d40 (patch)
tree20357a30fb8370a7b0501d7bc9de887836c92512 /src
parentf2632212ad7735c659331b65d3bfe14aef0faccb (diff)
fix merge collision
Diffstat (limited to 'src')
-rw-r--r--src/mesa/tnl/t_vp_build.c4
1 files changed, 1 insertions, 3 deletions
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);