kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Added a guard to prevent more than one texture to be generated per image.

Browse Source
This commit is contained in:
Charlie Carley 2007-03-08 03:00:33 +00:00
parent 9e2081a5fc
commit f56fca448a
1 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
source/gameengine/Ketsji/BL_Texture.cpp
View File

@ -100,7 +100,6 @@ void BL_Texture::DeleteTex()
glDeleteLists((GLuint)mDisableState, 1);
mDisableState =0;
}
g_textureManager.clear();
}
@ -130,16 +129,34 @@ bool BL_Texture::InitFromImage(int unit, Image *img, bool mipmap)
ActivateUnit(mUnit);
if (mTexture != 0) {
glBindTexture(GL_TEXTURE_2D, mTexture );
Validate();
return mOk;
}
// look for an existing gl image
BL_TextureMap::iterator mapLook = g_textureManager.find(img->id.name);
if (mapLook != g_textureManager.end())
{
if (mapLook->second.gl_texture != 0)
{
mTexture = mapLook->second.gl_texture;
glBindTexture(GL_TEXTURE_2D, mTexture);
mOk = IsValid();
return mOk;
}
}
mNeedsDeleted = 1;
glGenTextures(1, (GLuint*)&mTexture);
InitGLTex(ibuf->rect, ibuf->x, ibuf->y, mipmap);
// track created units
BL_TextureObject obj;
obj.gl_texture = mTexture;
obj.ref_buffer = img;
g_textureManager.insert(std::pair<char*, BL_TextureObject>((char*)img->id.name, obj));
glDisable(GL_TEXTURE_2D);