diff options
author | Campbell Barton <ideasman42@gmail.com> | 2011-01-15 19:14:57 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2011-01-15 19:14:57 +0300 |
commit | 86bbab7de53b07ad9a45b11dbff6bd5c0ee40c14 (patch) | |
tree | d3c0085903e25c08fcedf1426de535e27c9b2526 /source/blender/blenlib | |
parent | f66912a3351fc094e30daa5de53bef734493ad66 (diff) |
remove/comment unused defines.
Diffstat (limited to 'source/blender/blenlib')
-rw-r--r-- | source/blender/blenlib/BLI_math.h | 6 | ||||
-rw-r--r-- | source/blender/blenlib/BLI_math_base.h | 8 | ||||
-rw-r--r-- | source/blender/blenlib/BLI_math_color.h | 6 | ||||
-rw-r--r-- | source/blender/blenlib/BLI_math_geom.h | 8 | ||||
-rw-r--r-- | source/blender/blenlib/BLI_math_inline.h | 4 | ||||
-rw-r--r-- | source/blender/blenlib/BLI_math_matrix.h | 6 | ||||
-rw-r--r-- | source/blender/blenlib/BLI_math_rotation.h | 6 | ||||
-rw-r--r-- | source/blender/blenlib/BLI_math_vector.h | 8 | ||||
-rw-r--r-- | source/blender/blenlib/BLI_storage_types.h | 8 | ||||
-rw-r--r-- | source/blender/blenlib/intern/math_base_inline.c | 6 | ||||
-rw-r--r-- | source/blender/blenlib/intern/math_geom_inline.c | 6 | ||||
-rw-r--r-- | source/blender/blenlib/intern/math_vector_inline.c | 6 |
12 files changed, 35 insertions, 43 deletions
diff --git a/source/blender/blenlib/BLI_math.h b/source/blender/blenlib/BLI_math.h index d0fb530e349..29a17f362d4 100644 --- a/source/blender/blenlib/BLI_math.h +++ b/source/blender/blenlib/BLI_math.h @@ -25,8 +25,8 @@ * ***** END GPL LICENSE BLOCK ***** * */ -#ifndef BLI_MATH -#define BLI_MATH +#ifndef BLI_MATH_H +#define BLI_MATH_H /* Abbreviations: * @@ -60,5 +60,5 @@ #include "BLI_math_vector.h" #include "BLI_math_geom.h" -#endif /* BLI_MATH */ +#endif /* BLI_MATH_H */ diff --git a/source/blender/blenlib/BLI_math_base.h b/source/blender/blenlib/BLI_math_base.h index 2feacd64651..9ab9621be01 100644 --- a/source/blender/blenlib/BLI_math_base.h +++ b/source/blender/blenlib/BLI_math_base.h @@ -25,8 +25,8 @@ * ***** END GPL LICENSE BLOCK ***** * */ -#ifndef BLI_MATH_BASE -#define BLI_MATH_BASE +#ifndef BLI_MATH_BASE_H +#define BLI_MATH_BASE_H #ifdef __cplusplus extern "C" { @@ -140,7 +140,7 @@ extern "C" { #define CLAMP(a, b, c) if((a)<(b)) (a)=(b); else if((a)>(c)) (a)=(c) #endif -#ifdef BLI_MATH_INLINE +#ifdef BLI_MATH_INLINE_H #include "intern/math_base_inline.c" #endif @@ -173,5 +173,5 @@ double double_round(double x, int ndigits); } #endif -#endif /* BLI_MATH_BASE */ +#endif /* BLI_MATH_BASE_H */ diff --git a/source/blender/blenlib/BLI_math_color.h b/source/blender/blenlib/BLI_math_color.h index 0d88ef46104..bf466c0f809 100644 --- a/source/blender/blenlib/BLI_math_color.h +++ b/source/blender/blenlib/BLI_math_color.h @@ -25,8 +25,8 @@ * ***** END GPL LICENSE BLOCK ***** * */ -#ifndef BLI_MATH_COLOR -#define BLI_MATH_COLOR +#ifndef BLI_MATH_COLOR_H +#define BLI_MATH_COLOR_H #ifdef __cplusplus extern "C" { @@ -102,5 +102,5 @@ void rgb_float_to_byte(const float *in, unsigned char *out); } #endif -#endif /* BLI_MATH_COLOR */ +#endif /* BLI_MATH_COLOR_H */ diff --git a/source/blender/blenlib/BLI_math_geom.h b/source/blender/blenlib/BLI_math_geom.h index f8a4ee48c6f..701786e4b72 100644 --- a/source/blender/blenlib/BLI_math_geom.h +++ b/source/blender/blenlib/BLI_math_geom.h @@ -25,8 +25,8 @@ * ***** END GPL LICENSE BLOCK ***** * */ -#ifndef BLI_MATH_GEOM -#define BLI_MATH_GEOM +#ifndef BLI_MATH_GEOM_H +#define BLI_MATH_GEOM_H #ifdef __cplusplus extern "C" { @@ -34,7 +34,7 @@ extern "C" { #include "BLI_math_inline.h" -#ifdef BLI_MATH_INLINE +#ifdef BLI_MATH_INLINE_H #include "intern/math_geom_inline.c" #endif @@ -208,5 +208,5 @@ float form_factor_hemi_poly(float p[3], float n[3], } #endif -#endif /* BLI_MATH_GEOM */ +#endif /* BLI_MATH_GEOM_H */ diff --git a/source/blender/blenlib/BLI_math_inline.h b/source/blender/blenlib/BLI_math_inline.h index d002c0880b2..d07777c90a8 100644 --- a/source/blender/blenlib/BLI_math_inline.h +++ b/source/blender/blenlib/BLI_math_inline.h @@ -33,9 +33,9 @@ extern "C" { #endif /* add platform/compiler checks here if it is not supported */ -#define BLI_MATH_INLINE +#define BLI_MATH_INLINE_H -#ifdef BLI_MATH_INLINE +#ifdef BLI_MATH_INLINE_H #ifdef _MSC_VER #define MINLINE static __forceinline #define MALWAYS_INLINE MINLINE diff --git a/source/blender/blenlib/BLI_math_matrix.h b/source/blender/blenlib/BLI_math_matrix.h index 8fbd0205b41..475bbe8b4b7 100644 --- a/source/blender/blenlib/BLI_math_matrix.h +++ b/source/blender/blenlib/BLI_math_matrix.h @@ -25,8 +25,8 @@ * ***** END GPL LICENSE BLOCK ***** * */ -#ifndef BLI_MATH_MATRIX -#define BLI_MATH_MATRIX +#ifndef BLI_MATH_MATRIX_H +#define BLI_MATH_MATRIX_H #ifdef __cplusplus extern "C" { @@ -172,5 +172,5 @@ void print_m4(const char *str, float M[3][4]); } #endif -#endif /* BLI_MATH_MATRIX */ +#endif /* BLI_MATH_MATRIX_H */ diff --git a/source/blender/blenlib/BLI_math_rotation.h b/source/blender/blenlib/BLI_math_rotation.h index 72147962316..c3efc64b9d6 100644 --- a/source/blender/blenlib/BLI_math_rotation.h +++ b/source/blender/blenlib/BLI_math_rotation.h @@ -25,8 +25,8 @@ * ***** END GPL LICENSE BLOCK ***** * */ -#ifndef BLI_MATH_ROTATION -#define BLI_MATH_ROTATION +#ifndef BLI_MATH_ROTATION_H +#define BLI_MATH_ROTATION_H #ifdef __cplusplus extern "C" { @@ -180,5 +180,5 @@ float angle_to_lens(float angle); } #endif -#endif /* BLI_MATH_ROTATION */ +#endif /* BLI_MATH_ROTATION_H */ diff --git a/source/blender/blenlib/BLI_math_vector.h b/source/blender/blenlib/BLI_math_vector.h index 43cf612c33c..35b7939329a 100644 --- a/source/blender/blenlib/BLI_math_vector.h +++ b/source/blender/blenlib/BLI_math_vector.h @@ -25,8 +25,8 @@ * ***** END GPL LICENSE BLOCK ***** * */ -#ifndef BLI_MATH_VECTOR -#define BLI_MATH_VECTOR +#ifndef BLI_MATH_VECTOR_H +#define BLI_MATH_VECTOR_H #ifdef __cplusplus extern "C" { @@ -34,7 +34,7 @@ extern "C" { #include "BLI_math_inline.h" -#ifdef BLI_MATH_INLINE +#ifdef BLI_MATH_INLINE_H #include "intern/math_vector_inline.c" #endif @@ -184,5 +184,5 @@ void fill_vn(float *array_tar, const int size, const float val); } #endif -#endif /* BLI_MATH_VECTOR */ +#endif /* BLI_MATH_VECTOR_H */ diff --git a/source/blender/blenlib/BLI_storage_types.h b/source/blender/blenlib/BLI_storage_types.h index aabaf952228..c041b33c6a4 100644 --- a/source/blender/blenlib/BLI_storage_types.h +++ b/source/blender/blenlib/BLI_storage_types.h @@ -67,14 +67,6 @@ struct direntry{ struct ImBuf *image; }; -#define SELECT 1 -#define HIDDEN 1 -#define FIRST 1 -#define DESELECT 0 -#define NOT_YET 0 -#define VISIBLE 0 -#define LAST 0 - struct dirlink { struct dirlink *next,*prev; diff --git a/source/blender/blenlib/intern/math_base_inline.c b/source/blender/blenlib/intern/math_base_inline.c index fc413457122..e54b84d7aaf 100644 --- a/source/blender/blenlib/intern/math_base_inline.c +++ b/source/blender/blenlib/intern/math_base_inline.c @@ -32,8 +32,8 @@ #include "BLI_math.h" -#ifndef BLI_MATH_BASE_INLINE -#define BLI_MATH_BASE_INLINE +#ifndef BLI_MATH_BASE_INLINE_H +#define BLI_MATH_BASE_INLINE_H /* A few small defines. Keep'em local! */ #define SMALL_NUMBER 1.e-8 @@ -127,5 +127,5 @@ MINLINE float signf(float f) return (f < 0.f)? -1.f: 1.f; } -#endif /* BLI_MATH_BASE_INLINE */ +#endif /* BLI_MATH_BASE_INLINE_H */ diff --git a/source/blender/blenlib/intern/math_geom_inline.c b/source/blender/blenlib/intern/math_geom_inline.c index f2d8e27cbd5..c583990fef7 100644 --- a/source/blender/blenlib/intern/math_geom_inline.c +++ b/source/blender/blenlib/intern/math_geom_inline.c @@ -27,8 +27,8 @@ #include "BLI_math.h" -#ifndef BLI_MATH_GEOM_INLINE -#define BLI_MATH_GEOM_INLINE +#ifndef BLI_MATH_GEOM_INLINE_H +#define BLI_MATH_GEOM_INLINE_H /****************************** Spherical Harmonics **************************/ @@ -134,5 +134,5 @@ MINLINE void madd_sh_shfl(float r[9], float sh[3], float f) add_sh_shsh(r, r, tmp); } -#endif /* BLI_MATH_GEOM_INLINE */ +#endif /* BLI_MATH_GEOM_INLINE_H */ diff --git a/source/blender/blenlib/intern/math_vector_inline.c b/source/blender/blenlib/intern/math_vector_inline.c index b0666d2ed5d..8f00e7b6d0c 100644 --- a/source/blender/blenlib/intern/math_vector_inline.c +++ b/source/blender/blenlib/intern/math_vector_inline.c @@ -27,8 +27,8 @@ #include "BLI_math.h" -#ifndef BLI_MATH_VECTOR_INLINE -#define BLI_MATH_VECTOR_INLINE +#ifndef BLI_MATH_VECTOR_INLINE_H +#define BLI_MATH_VECTOR_INLINE_H /********************************** Init *************************************/ @@ -482,5 +482,5 @@ MINLINE float line_point_side_v2(const float *l1, const float *l2, const float * ((l2[0]-pt[0]) * (l1[1]-pt[1])); } -#endif /* BLI_MATH_VECTOR_INLINE */ +#endif /* BLI_MATH_VECTOR_INLINE_H */ |