From ba1073828f65045aac3b788d345a7c32b820de64 Mon Sep 17 00:00:00 2001 From: Lynix Date: Sun, 16 Aug 2015 01:44:17 +0200 Subject: [PATCH] Graphics: Improve code Former-commit-id: d548b513aef5190e20bc065653178981c5d18f68 --- include/Nazara/Graphics/Model.hpp | 3 +-- include/Nazara/Graphics/Sprite.inl | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/include/Nazara/Graphics/Model.hpp b/include/Nazara/Graphics/Model.hpp index b794d098b..80fc8c3db 100644 --- a/include/Nazara/Graphics/Model.hpp +++ b/include/Nazara/Graphics/Model.hpp @@ -10,8 +10,8 @@ #include #include #include -#include #include +#include #include struct NAZARA_GRAPHICS_API NzModelParameters @@ -34,7 +34,6 @@ using NzModelRef = NzObjectRef; class NAZARA_GRAPHICS_API NzModel : public NzInstancedRenderable, public NzResource { friend NzModelLoader; - friend class NzScene; public: NzModel(); diff --git a/include/Nazara/Graphics/Sprite.inl b/include/Nazara/Graphics/Sprite.inl index 1ce1cf534..1051fee6f 100644 --- a/include/Nazara/Graphics/Sprite.inl +++ b/include/Nazara/Graphics/Sprite.inl @@ -72,7 +72,7 @@ inline void NzSprite::SetDefaultMaterial() material->Enable(nzRendererParameter_FaceCulling, false); material->EnableLighting(false); - SetMaterial(material); + SetMaterial(std::move(material)); } inline void NzSprite::SetMaterial(NzMaterialRef material, bool resizeSprite)