diff options
| author | Brian Paul <[email protected]> | 2008-05-16 15:17:35 -0600 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2008-05-16 15:17:35 -0600 |
| commit | f27c6f313955b737888ce80752ee9cd895562d40 (patch) | |
| tree | 20357a30fb8370a7b0501d7bc9de887836c92512 | |
| parent | f2632212ad7735c659331b65d3bfe14aef0faccb (diff) | |
fix merge collision
| -rw-r--r-- | src/mesa/tnl/t_vp_build.c | 4 |
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 4432893f175..46446d48859 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); |