Merge remote-tracking branch 'upstream/master'

2012-07-24 14:35:05 +02:00
parent 354d7ed002 06eda4eba9
commit ed200354cb
112 changed files with 4780 additions and 1469 deletions
--- a/include/Nazara/Math/Vector3.inl
+++ b/include/Nazara/Math/Vector3.inl
@@ -39,10 +39,10 @@ z(vec[2])
 }

 template<typename T>
-NzVector3<T>::NzVector3(const NzVector2<T>& vec) :
+NzVector3<T>::NzVector3(const NzVector2<T>& vec, T Z) :
 x(vec.x),
 y(vec.y),
-z(0)
+z(Z)
 {
 }