mirror/Aquaria
1
0
Fork 0
mirror of https://github.com/AquariaOSE/Aquaria.git synced 2025-10-08 07:11:16 +00:00
Code Issues Releases Wiki Activity

Fix rare texture loading problems introduced in 8bd40be8aa and f0d580d873.

Browse source
This commit is contained in:
fgenesis 2016-03-13 01:37:43 +01:00
commit 62c949f640
5 changed files with 29 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

4
BBGE/Core.h
View file

@ -1023,7 +1023,7 @@ public:
void removeTexture(Texture *res);
void clearResources();
CountedPtr<Texture> addTexture(const std::string &texture, TextureLoadResult *pLoadResult = 0);
CountedPtr<Texture> addTexture(const std::string &texture);
PostProcessingFX postProcessingFx;
@ -1328,7 +1328,7 @@ protected:
virtual void onReloadResources();
std::pair<CountedPtr<Texture>, TextureLoadResult> doTextureAdd(const std::string &texture, const std::string &name, std::string internalTextureName);
CountedPtr<Texture> doTextureAdd(const std::string &texture, const std::string &name, std::string internalTextureName);
void deleteRenderObjectMemory(RenderObject *r);
bool _hasFocus;