diff options
| author | Joseph Eagar <joeedh@gmail.com> | 2009-07-16 10:27:37 +0400 |
|---|---|---|
| committer | Joseph Eagar <joeedh@gmail.com> | 2009-07-16 10:27:37 +0400 |
| commit | 0b1649b2b86b52b44bdabf8e3542d8adffb55623 (patch) | |
| tree | 542e10220a719f2a54e8afbee7b11195b6dac344 /source/blender/blenkernel/BKE_utildefines.h | |
| parent | 3bade135035dacfdb4a3833f3fac3bf5811ce7de (diff) | |
| parent | 0bfc98706ef93f90bd74b195b98c36c7dcea94dd (diff) | |
merge with 2.5 at r21568
Diffstat (limited to 'source/blender/blenkernel/BKE_utildefines.h')
| -rw-r--r-- | source/blender/blenkernel/BKE_utildefines.h | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/source/blender/blenkernel/BKE_utildefines.h b/source/blender/blenkernel/BKE_utildefines.h index a36926465d7..3c01f86dc02 100644 --- a/source/blender/blenkernel/BKE_utildefines.h +++ b/source/blender/blenkernel/BKE_utildefines.h @@ -130,9 +130,10 @@ #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) && !defined(__BeOS) +#if !defined(WIN32) #ifndef O_BINARY #define O_BINARY 0 #endif @@ -150,12 +151,6 @@ #define ID_NEW(a) if( (a) && (a)->id.newid ) (a)= (void *)(a)->id.newid #define FORM MAKE_ID('F','O','R','M') -#define DDG1 MAKE_ID('3','D','G','1') -#define DDG2 MAKE_ID('3','D','G','2') -#define DDG3 MAKE_ID('3','D','G','3') -#define DDG4 MAKE_ID('3','D','G','4') - -#define GOUR MAKE_ID('G','O','U','R') #define BLEN MAKE_ID('B','L','E','N') #define DER_ MAKE_ID('D','E','R','_') |