Index: trunk/src/gfx/keyframed_mesh.cc
===================================================================
--- trunk/src/gfx/keyframed_mesh.cc	(revision 451)
+++ trunk/src/gfx/keyframed_mesh.cc	(revision 454)
@@ -217,7 +217,7 @@
 		for ( size_t i = 0; i < m_vertex_count; ++i )
 		{
-			vtx[i].position = glm::mix( prev[i].position, next[i].position, m_interpolation );
-			vtx[i].normal   = glm::mix( prev[i].normal,   next[i].normal,   m_interpolation );
-			vtx[i].tangent  = glm::mix( prev[i].tangent,  next[i].tangent,   m_interpolation );
+			vtx[i].position = math::mix( prev[i].position, next[i].position, m_interpolation );
+			vtx[i].normal   = math::mix( prev[i].normal,   next[i].normal,   m_interpolation );
+			vtx[i].tangent  = math::mix( prev[i].tangent,  next[i].tangent,   m_interpolation );
 		}
 	}
@@ -231,6 +231,6 @@
 		for ( size_t i = 0; i < m_vertex_count; ++i )
 		{
-			vtx[i].position = glm::mix( prev[i].position, next[i].position, m_interpolation );
-			vtx[i].normal   = glm::mix( prev[i].normal,   next[i].normal,   m_interpolation );
+			vtx[i].position = math::mix( prev[i].position, next[i].position, m_interpolation );
+			vtx[i].normal   = math::mix( prev[i].normal,   next[i].normal,   m_interpolation );
 		}
 	}
Index: trunk/src/gfx/mesh_creator.cc
===================================================================
--- trunk/src/gfx/mesh_creator.cc	(revision 451)
+++ trunk/src/gfx/mesh_creator.cc	(revision 454)
@@ -95,5 +95,5 @@
 void nv::mesh_nodes_creator::transform( float scale, const mat3& r33 )
 {
-	mat3 ri33 = glm::inverse( r33 );
+	mat3 ri33 = math::inverse( r33 );
 	mat4 pre_transform ( scale * r33 );
 	mat4 post_transform( 1.f/scale * ri33 ); 
@@ -150,5 +150,5 @@
 			{
 				vec3& n = *reinterpret_cast<vec3*>( raw_data + vtx_size*i + n_offset );
-				n = glm::normalize( normal_transform * n );
+				n = math::normalize( normal_transform * n );
 			}
 		if ( t_offset != -1 )
@@ -156,5 +156,5 @@
 			{
 				vec4& t = *reinterpret_cast<vec4*>(raw_data + vtx_size*i + t_offset );
-				t = vec4( glm::normalize( normal_transform * vec3(t) ), t[3] );
+				t = vec4( math::normalize( normal_transform * vec3(t) ), t[3] );
 			}
 	}
@@ -299,5 +299,5 @@
 			vec3 xyz2 = v2 - v1;
 
-			//vec3 normal = glm::cross( xyz1, xyz2 );
+			//vec3 normal = math::cross( xyz1, xyz2 );
 			//
 			//vtcs[ ti0 ].normal += normal;
@@ -323,6 +323,6 @@
 		if ( ! ( t.x == 0.0f && t.y == 0.0f && t.z == 0.0f ) )
 		{
-			tangents[i]    = vec4( glm::normalize(t - n * glm::dot( n, t )), 0.0f ); 
-			tangents[i][3] = (glm::dot(glm::cross(n, t), tangents2[i]) < 0.0f) ? -1.0f : 1.0f;
+			tangents[i]    = vec4( math::normalize(t - n * math::dot( n, t )), 0.0f );
+			tangents[i][3] = ( math::dot( math::cross(n, t), tangents2[i]) < 0.0f) ? -1.0f : 1.0f;
 		}
 	}