Merge branch 'master' into NDK

Conflicts: src/Nazara/Physics/Geom.cpp Former-commit-id: 8fd71e34dbe105890042acc55e30b64e7c457ed4
2015-05-06 23:45:41 +02:00
parent ca291d7285 55b94f2bbf
commit 446f537e3f
27 changed files with 203 additions and 143 deletions
--- a/include/Nazara/Math/Matrix4.inl
+++ b/include/Nazara/Math/Matrix4.inl
@@ -748,7 +748,6 @@ NzMatrix4<T>& NzMatrix4<T>::Set(const T matrix[16])
 template<typename T>
 NzMatrix4<T>& NzMatrix4<T>::Set(const NzMatrix4& matrix)
 {
-	// Le membre isIdentity est copié en même temps que les valeurs
 	std::memcpy(this, &matrix, sizeof(NzMatrix4));

 	return *this;