Fixed merge

2013-05-06 15:34:37 +02:00
parent 57a093035f 86a5825fee
commit e3da5f952c
3 changed files with 28 additions and 25 deletions
--- a/test/core/core_type_cast.cpp
+++ b/test/core/core_type_cast.cpp
@@ -27,8 +27,8 @@ int test_vec2_cast()
 	glm::mediump_vec2 G = static_cast<glm::mediump_vec2>(A);
 	glm::highp_vec2 H = static_cast<glm::highp_vec2>(A);
 	
-	my_vec2 I;
-	glm::vec2 J = static_cast<glm::vec2>(I);
+	//my_vec2 I;
+	//glm::vec2 J = static_cast<glm::vec2>(I);

 	int Error(0);