Merge branch 'NateEag-master-patch-12920' into 'master'

[xonotic/netradiant.git] / libs / splines / math_matrix.h

diff --git a/libs/splines/math_matrix.h b/libs/splines/math_matrix.h
index 41216ee0ec7018828caeb9006c728dc9d7b92f51..b981567e0cd2adf9ad591ad7ded7d4001c8a85e2 100644 (file)
--- a/libs/splines/math_matrix.h
+++ b/libs/splines/math_matrix.h
@@ -1,5 +1,5 @@
 /*
-   Copyright (C) 1999-2007 id Software, Inc. and contributors.
+   Copyright (C) 1999-2006 Id Software, Inc. and contributors.
    For a list of contributors, see the accompanying CONTRIBUTORS file.
 
    This file is part of GtkRadiant.
@@ -25,14 +25,6 @@
 #include <string.h>
 #include "math_vector.h"
 
-#ifndef ID_INLINE
-#ifdef _WIN32
-#define ID_INLINE __inline
-#else
-#define ID_INLINE inline
-#endif
-#endif
-
 class quat_t;
 class angles_t;
 
@@ -84,7 +76,12 @@ ID_INLINE mat3_t::mat3_t() {
 }
 
 ID_INLINE mat3_t::mat3_t( float src[ 3 ][ 3 ] ) {
-       memcpy( mat, src, sizeof( src ) );
+       //memcpy( mat, src, sizeof( src ) );
+       for( unsigned int i = 0; i < 3; i++ ) {
+               mat[i].x = src[i][0];
+               mat[i].y = src[i][1];
+               mat[i].z = src[i][2];
+       }
 }
 
 ID_INLINE mat3_t::mat3_t( idVec3 const &x, idVec3 const &y, idVec3 const &z ) {