mewin/glm
1
0
Fork 0
Code Releases Activity

Fixed build

Browse Source
This commit is contained in:
Christophe Riccio
2016-05-23 21:59:25 +02:00
parent 8b9d205178
commit 62d5e0ce45
1 changed files with 0 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
glm/detail/type_vec4.inl
View File

@@ -373,11 +373,7 @@ namespace detail
template <typename U> template <typename U>
GLM_FUNC_QUALIFIER tvec4<T, P> & tvec4<T, P>::operator-=(tvec1<U, P> const & v) GLM_FUNC_QUALIFIER tvec4<T, P> & tvec4<T, P>::operator-=(tvec1<U, P> const & v)
{ {
<<<<<<< HEAD
return (*this = detail::compute_vec4_sub<T, P>::call(*this, tvec4<T, P>(v)));
=======
return (*this = detail::compute_vec4_sub<T, P>::call(*this, tvec4<T, P>(v.x))); return (*this = detail::compute_vec4_sub<T, P>::call(*this, tvec4<T, P>(v.x)));
>>>>>>> simd
} }
template <typename T, precision P> template <typename T, precision P>
@@ -398,11 +394,7 @@ namespace detail
template <typename U> template <typename U>
GLM_FUNC_QUALIFIER tvec4<T, P> & tvec4<T, P>::operator*=(tvec1<U, P> const & v) GLM_FUNC_QUALIFIER tvec4<T, P> & tvec4<T, P>::operator*=(tvec1<U, P> const & v)
{ {
<<<<<<< HEAD
return (*this = detail::compute_vec4_mul<T, P>::call(*this, tvec4<T, P>(v)));
=======
return (*this = detail::compute_vec4_mul<T, P>::call(*this, tvec4<T, P>(v.x))); return (*this = detail::compute_vec4_mul<T, P>::call(*this, tvec4<T, P>(v.x)));
>>>>>>> simd
} }
template <typename T, precision P> template <typename T, precision P>
@@ -423,22 +415,14 @@ namespace detail
template <typename U> template <typename U>
GLM_FUNC_QUALIFIER tvec4<T, P> & tvec4<T, P>::operator/=(tvec1<U, P> const & v) GLM_FUNC_QUALIFIER tvec4<T, P> & tvec4<T, P>::operator/=(tvec1<U, P> const & v)
{ {
<<<<<<< HEAD
return (*this = (detail::compute_vec4_div<T, P>::call(*this, tvec4<T, P>(v))));
=======
return (*this = detail::compute_vec4_div<T, P>::call(*this, tvec4<T, P>(v.x))); return (*this = detail::compute_vec4_div<T, P>::call(*this, tvec4<T, P>(v.x)));
>>>>>>> simd
} }
template <typename T, precision P> template <typename T, precision P>
template <typename U> template <typename U>
GLM_FUNC_QUALIFIER tvec4<T, P> & tvec4<T, P>::operator/=(tvec4<U, P> const & v) GLM_FUNC_QUALIFIER tvec4<T, P> & tvec4<T, P>::operator/=(tvec4<U, P> const & v)
{ {
<<<<<<< HEAD
return (*this = (detail::compute_vec4_div<T, P>::call(*this, tvec4<T, P>(v))));
=======
return (*this = detail::compute_vec4_div<T, P>::call(*this, tvec4<T, P>(v))); return (*this = detail::compute_vec4_div<T, P>::call(*this, tvec4<T, P>(v)));
>>>>>>> simd
} }
// -- Increment and decrement operators -- // -- Increment and decrement operators --