mirror of
https://github.com/g-truc/glm.git
synced 2024-11-10 04:31:47 +00:00
Fixed merge
This commit is contained in:
commit
85ae145cf5
@ -109,7 +109,7 @@ namespace detail
|
|||||||
{
|
{
|
||||||
value_type const Zero(0);
|
value_type const Zero(0);
|
||||||
this->value[0] = col_type(s, Zero, Zero, Zero);
|
this->value[0] = col_type(s, Zero, Zero, Zero);
|
||||||
this->value[1] = col_type(Zero, Zero, Zero, Zero);
|
this->value[1] = col_type(Zero, s, Zero, Zero);
|
||||||
}
|
}
|
||||||
|
|
||||||
template <typename T, precision P>
|
template <typename T, precision P>
|
||||||
|
@ -49,6 +49,12 @@ GLM 0.9.5.0: 2013-XX-XX
|
|||||||
- Added quaternion comparison functions
|
- Added quaternion comparison functions
|
||||||
- Fixed GTX_multiple for negative value
|
- Fixed GTX_multiple for negative value
|
||||||
|
|
||||||
|
================================================================================
|
||||||
|
GLM 0.9.4.4: 2013-0X-XX
|
||||||
|
--------------------------------------------------------------------------------
|
||||||
|
- Fixed slerp when costheta is close to 1
|
||||||
|
- Fixed mat4x2 value_type constructor
|
||||||
|
|
||||||
================================================================================
|
================================================================================
|
||||||
GLM 0.9.4.3: 2013-03-20
|
GLM 0.9.4.3: 2013-03-20
|
||||||
--------------------------------------------------------------------------------
|
--------------------------------------------------------------------------------
|
||||||
|
Loading…
Reference in New Issue
Block a user