diff options
author | Andre Susano Pinto <andresusanopinto@gmail.com> | 2009-08-01 14:21:26 +0400 |
---|---|---|
committer | Andre Susano Pinto <andresusanopinto@gmail.com> | 2009-08-01 14:21:26 +0400 |
commit | c3a4936d9dc4abc6be5c74a16521d252893a2805 (patch) | |
tree | 0c4ef038058d84e37a0c302bef89240eb780d2e0 /source/blender/blenkernel/BKE_utildefines.h | |
parent | 2830f25ff3bf7a80c88b86132f76081ced3e86a1 (diff) | |
parent | 78bbe5c479f80a331528d730486770c4f46e74fc (diff) |
svn merge -r 21508:22111 https://svn.blender.org/svnroot/bf-blender/branches/blender2.5/blender
Diffstat (limited to 'source/blender/blenkernel/BKE_utildefines.h')
-rw-r--r-- | source/blender/blenkernel/BKE_utildefines.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/source/blender/blenkernel/BKE_utildefines.h b/source/blender/blenkernel/BKE_utildefines.h index 1c88b94df85..f5287e4e100 100644 --- a/source/blender/blenkernel/BKE_utildefines.h +++ b/source/blender/blenkernel/BKE_utildefines.h @@ -136,6 +136,7 @@ #define IS_EQT(a, b, c) ((a > b)? (((a-b) <= c)? 1:0) : ((((b-a) <= c)? 1:0))) #define IN_RANGE(a, b, c) ((b < c)? ((b<a && a<c)? 1:0) : ((c<a && a<b)? 1:0)) +#define IN_RANGE_INCL(a, b, c) ((b < c)? ((b<=a && a<=c)? 1:0) : ((c<=a && a<=b)? 1:0)) /* this weirdo pops up in two places ... */ #if !defined(WIN32) |