Merge branch 'master' into automatic-file-fix

2021-10-28 09:57:59 +02:00
parent a02b1952c0 7d279dce4b
commit a3d9aaf1fb
55 changed files with 780 additions and 517 deletions
--- a/include/Nazara/Graphics/WorldInstance.inl
+++ b/include/Nazara/Graphics/WorldInstance.inl
@@ -23,16 +23,6 @@ namespace Nz
 		return m_invWorldMatrix;
 	}

-	inline ShaderBinding& WorldInstance::GetShaderBinding()
-	{
-		return *m_shaderBinding;
-	}
-
-	inline const ShaderBinding& WorldInstance::GetShaderBinding() const
-	{
-		return *m_shaderBinding;
-	}
-
 	inline const Matrix4f& WorldInstance::GetWorldMatrix() const
 	{
 		return m_worldMatrix;