mewin/glm
1
0
Fork 0
Code Releases Activity

Merge branch '0.9.3' into 0.9.4

Browse Source
This commit is contained in:
Christophe Riccio
2012-01-25 15:53:41 +00:00
parent db150c6bda b08fd7e4b3
commit ebd1ba8bf6
392 changed files with 25925 additions and 47116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
glm/core/_swizzle.hpp
View File

@@ -93,7 +93,7 @@ namespace detail
};
// Internal class for implementing swizzle operators
/*!
/*
Template parameters:
ValueType = type of scalar values (e.g. float, double)

2
glm/core/setup.hpp
View File

@@ -414,7 +414,7 @@
#define GLM_LANG_CXX98 ((1 << 1) | GLM_LANG_CXX)
#define GLM_LANG_CXX03 ((1 << 2) | GLM_LANG_CXX98)
#define GLM_LANG_CXX0X ((1 << 3) | GLM_LANG_CXX03)
#define GLM_LANG_CXX11 ((1 << 4) | GLM_LANG_CXX11)
#define GLM_LANG_CXX11 ((1 << 4) | GLM_LANG_CXX0X)
#define GLM_LANG_CXXMS (1 << 5)
#define GLM_LANG_CXXGNU (1 << 6)

4
glm/core/type_half.inl
View File

@@ -250,9 +250,7 @@ namespace detail
// Assemble the half from s, e and m.
//
hdata Hdata(s | (e << 10) | (m >> 13));
return Hdata;
return hdata(s | (e << 10) | (m >> 13));
}
}