diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-02-11 08:10:50 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-02-11 08:10:50 +0400 |
| commit | 5ea86e1e2b09b58a72992083f79c03ee3f20af49 (patch) | |
| tree | 79d682900c73c4a87aa90a8d9dbd293c4396013e /intern | |
| parent | dd2b4a05c3dc527bc0c459f81f5810e6ecb151a6 (diff) | |
| parent | 758c2282635f77ee1317d4bdbdf1959bf0c09525 (diff) | |
svn merge ^/trunk/blender -r43995:44024
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/elbeem/intern/ntl_vector3dim.h | 6 | ||||
| -rw-r--r-- | intern/elbeem/intern/utilities.h | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/intern/elbeem/intern/ntl_vector3dim.h b/intern/elbeem/intern/ntl_vector3dim.h index 02d54dd5e01..1e9728d7658 100644 --- a/intern/elbeem/intern/ntl_vector3dim.h +++ b/intern/elbeem/intern/ntl_vector3dim.h @@ -27,6 +27,12 @@ #include <stdio.h> #include <stdlib.h> +/* absolute value */ +template < class T > +inline T +ABS( T a ) +{ return (0 < a) ? a : -a ; } + // hack for MSVC6.0 compiler #ifdef _MSC_VER #if _MSC_VER < 1300 diff --git a/intern/elbeem/intern/utilities.h b/intern/elbeem/intern/utilities.h index dd394005988..2b33c142e32 100644 --- a/intern/elbeem/intern/utilities.h +++ b/intern/elbeem/intern/utilities.h @@ -177,12 +177,6 @@ inline T MAX( T a, T b ) { return (a < b) ? b : a ; } -/* absolute value */ -template < class T > -inline T -ABS( T a ) -{ return (0 < a) ? a : -a ; } - /* sign of the value */ template < class T > inline T |