X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FTexture.cpp;h=08010c389f3ed0c84951e768edbf61424c8111ec;hb=94df0906c159318cb39bb4ee063336ba3cf51ccb;hp=adbef9f7819403a8dcdc16c2fe0d4c56debdb563;hpb=cedb9cffef6e30a2c04239c60027029da48b3897;p=lugaru.git diff --git a/Source/Texture.cpp b/Source/Texture.cpp index adbef9f..08010c3 100644 --- a/Source/Texture.cpp +++ b/Source/Texture.cpp @@ -24,15 +24,16 @@ along with Lugaru. If not, see . using namespace std; -extern ImageRec texture; extern bool trilinear; vector TextureRes::list; void TextureRes::load() { - //load image into 'texture' global var - upload_image(ConvertFileName(filename.c_str())); + ImageRec texture; + + //load image into 'texture' + load_image(ConvertFileName(filename.c_str()), texture); skinsize = texture.sizeX; GLuint type = GL_RGBA;