diff options
| author | marha <marha@users.sourceforge.net> | 2009-12-22 18:18:58 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2009-12-22 18:18:58 +0000 |
| commit | 3b79162ea5c5be078326f2e0ea85b0f84c02f166 (patch) | |
| tree | 6826d1ef026f16ec12d35ee6bd4a892d0a05b7e0 /mesalib/src/mesa/main/texobj.c | |
| parent | 4284aeba874b9168f2228c59639bec8346a56796 (diff) | |
| parent | b729d9e1cc1c60e415da24143cabcbaccb525ed7 (diff) | |
| download | vcxsrv-3b79162ea5c5be078326f2e0ea85b0f84c02f166.tar.gz vcxsrv-3b79162ea5c5be078326f2e0ea85b0f84c02f166.tar.bz2 vcxsrv-3b79162ea5c5be078326f2e0ea85b0f84c02f166.zip | |
svn merge ^/branches/released
Diffstat (limited to 'mesalib/src/mesa/main/texobj.c')
| -rw-r--r-- | mesalib/src/mesa/main/texobj.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mesalib/src/mesa/main/texobj.c b/mesalib/src/mesa/main/texobj.c index d09c43925..da55ac869 100644 --- a/mesalib/src/mesa/main/texobj.c +++ b/mesalib/src/mesa/main/texobj.c @@ -863,7 +863,7 @@ unbind_texobj_from_texunits(GLcontext *ctx, struct gl_texture_object *texObj) for (tex = 0; tex < NUM_TEXTURE_TARGETS; tex++) { if (texObj == unit->CurrentTex[tex]) { _mesa_reference_texobj(&unit->CurrentTex[tex], - ctx->Shared->DefaultTex[TEXTURE_1D_INDEX]); + ctx->Shared->DefaultTex[tex]); ASSERT(unit->CurrentTex[tex]); break; } |