Merge branch 'master' into culling

2016-11-07 11:26:48 +01:00
parent 89431f9c4f 2f11529669
commit 9e84c397ba
85 changed files with 2580 additions and 1234 deletions
--- a/src/Nazara/Graphics/InstancedRenderable.cpp
+++ b/src/Nazara/Graphics/InstancedRenderable.cpp
@@ -94,6 +94,7 @@ namespace Nz
 	void InstancedRenderable::UpdateData(InstanceData* instanceData) const
 	{
 		NazaraAssert(instanceData, "Invalid instance data");
+		NazaraUnused(instanceData);
 	}

 	InstancedRenderableLibrary::LibraryMap InstancedRenderable::s_library;