Merge branch '0.9.0' into 0.9.1

This commit is contained in:
Christophe Riccio 2011-01-19 12:32:00 +00:00
commit c9bc025081
2 changed files with 10 additions and 13 deletions

View File

@ -1,3 +1,13 @@
///////////////////////////////////////////////////////////////////////////////////////////////////
// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net)
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
// Created : 2011-01-19
// Updated : 2011-01-19
// Licence : This source is under MIT License
// File : glm/setup.hpp
///////////////////////////////////////////////////////////////////////////////////////////////////
// Dummy file, GLM is a header only library
#include "../glm.hpp"
#include "../ext.hpp"

View File

@ -1152,19 +1152,6 @@ namespace glm
~v.w);
}
template <typename T>
inline tvec4<T> operator~
(
tvec4<T> const & v
)
{
return tvec4<T>(
~v.x,
~v.y,
~v.z,
~v.w);
}
//////////////////////////////////////
// tref definition