From dc3cfa40ec1d584126474ce83b6697e1823b7a17 Mon Sep 17 00:00:00 2001 From: Lynix Date: Mon, 24 Dec 2012 20:38:20 +0100 Subject: [PATCH] Made Texture constructor consistent Former-commit-id: 92be798524a48cb979c09fa04558602bf3717391 --- include/Nazara/Renderer/Texture.hpp | 4 ++-- src/Nazara/Renderer/Texture.cpp | 8 +------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/include/Nazara/Renderer/Texture.hpp b/include/Nazara/Renderer/Texture.hpp index 3ea82ba54..4fd364060 100644 --- a/include/Nazara/Renderer/Texture.hpp +++ b/include/Nazara/Renderer/Texture.hpp @@ -22,7 +22,7 @@ class NAZARA_API NzTexture : public NzResource, NzNonCopyable friend class NzShader; public: - NzTexture(); + NzTexture() = default; explicit NzTexture(const NzImage& image); ~NzTexture(); @@ -83,7 +83,7 @@ class NAZARA_API NzTexture : public NzResource, NzNonCopyable NzRenderTexture* GetRenderTexture() const; void SetRenderTexture(NzRenderTexture* renderTexture); - NzTextureImpl* m_impl; + NzTextureImpl* m_impl = nullptr; }; #endif // NAZARA_TEXTURE_HPP diff --git a/src/Nazara/Renderer/Texture.cpp b/src/Nazara/Renderer/Texture.cpp index 666e762ce..8beeb2b24 100644 --- a/src/Nazara/Renderer/Texture.cpp +++ b/src/Nazara/Renderer/Texture.cpp @@ -191,13 +191,7 @@ namespace } } -NzTexture::NzTexture() : -m_impl(nullptr) -{ -} - -NzTexture::NzTexture(const NzImage& image) : -m_impl(nullptr) +NzTexture::NzTexture(const NzImage& image) { LoadFromImage(image);