Browse Source

Merge branch '0.9.5' of https://github.com/g-truc/glm into 0.9.5

Christophe Riccio 12 years ago
parent
commit
2badec664f
1 changed files with 7 additions and 1 deletions
  1. 7 1
      test/core/core_type_mat4x4.cpp

+ 7 - 1
test/core/core_type_mat4x4.cpp

@@ -129,13 +129,19 @@ int test_ctr()
 
 
 #if(GLM_HAS_INITIALIZER_LISTS)
 #if(GLM_HAS_INITIALIZER_LISTS)
 	glm::mat4 m1{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15};
 	glm::mat4 m1{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15};
-	
+
 	glm::mat4 m2{
 	glm::mat4 m2{
 		{0, 1, 2, 3},
 		{0, 1, 2, 3},
 		{4, 5, 6, 7},
 		{4, 5, 6, 7},
 		{8, 9, 10, 11},
 		{8, 9, 10, 11},
 		{12, 13, 14, 15}};
 		{12, 13, 14, 15}};
 
 
+	std::vector<glm::mat4> m3{
+		{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15},
+		{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15},
+		{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15},
+		{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15}};
+
 /*
 /*
 	std::initializer_list<glm::mat4> m3{
 	std::initializer_list<glm::mat4> m3{
 		{0, 1, 2, 3},
 		{0, 1, 2, 3},