sid/NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed material texture loader leaks

Browse Source 
Also made it exception-safe


Former-commit-id: db2b96d11fd6d604861911b2f4ea268b7fd3d5ad
This commit is contained in:
Lynix
2013-03-24 01:01:53 +01:00
parent 9c88cbfa84
commit be894c5555
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/Nazara/Renderer/Loaders/Texture/Loader.cpp
View File

@@ -5,7 +5,8 @@
#include <Nazara/Renderer/Loaders/Texture.hpp> #include <Nazara/Renderer/Loaders/Texture.hpp>
#include <Nazara/Renderer/Material.hpp> #include <Nazara/Renderer/Material.hpp>
#include <Nazara/Renderer/Texture.hpp> #include <Nazara/Renderer/Texture.hpp>
#include <Nazara/Utility/Debug.hpp> #include <memory>
#include <Nazara/Renderer/Debug.hpp>
namespace namespace
{ {
@@ -21,7 +22,9 @@ namespace
{ {
NazaraUnused(parameters); NazaraUnused(parameters);
NzTexture* texture = new NzTexture; std::unique_ptr<NzTexture> texture(new NzTexture);
texture->SetPersistent(false, false);
if (!texture->LoadFromStream(stream)) if (!texture->LoadFromStream(stream))
{ {
NazaraError("Failed to load diffuse map"); NazaraError("Failed to load diffuse map");
@@ -29,8 +32,8 @@ namespace
} }
material->Reset(); material->Reset();
material->SetDiffuseMap(texture); material->SetDiffuseMap(texture.get());
texture->SetPersistent(false); texture.release();
return true; return true;
} }