am 9c0a80b8: Merge "Fix undefined behavior (not returning a value from a function with return)." into lmp-dev

* commit '9c0a80b8f48ba3a183afff5820f4ffad29b31224':
  Fix undefined behavior (not returning a value from a function with return).
This commit is contained in:
Stephen Hines 2014-09-04 22:09:07 +00:00 committed by Android Git Automerger
commit c1ad526c9c

View File

@ -322,6 +322,7 @@ tmat44<T> tmat44<T>::rotate(A radian, const tvec3<B>& about) {
r[ 1] = xy*nc + zs; r[ 5] = y*y*nc + c; r[ 9] = yz*nc - xs; r[ 1] = xy*nc + zs; r[ 5] = y*y*nc + c; r[ 9] = yz*nc - xs;
r[ 2] = zx*nc - ys; r[ 6] = yz*nc + xs; r[10] = z*z*nc + c; r[ 2] = zx*nc - ys; r[ 6] = yz*nc + xs; r[10] = z*z*nc + c;
} }
return rotation;
} }
// ---------------------------------------------------------------------------------------- // ----------------------------------------------------------------------------------------