diff options
| author | Andre Susano Pinto <andresusanopinto@gmail.com> | 2009-07-02 06:59:43 +0400 |
|---|---|---|
| committer | Andre Susano Pinto <andresusanopinto@gmail.com> | 2009-07-02 06:59:43 +0400 |
| commit | 2acac0ff997832f5a1b25fdaf36321a6e5d7c771 (patch) | |
| tree | 622403467484aca3905e4f403f0de6c62f575d0a /source/blender/blenkernel/BKE_utildefines.h | |
| parent | 1b557a61a53235f978262c52ac79fa16464bdd91 (diff) | |
| parent | 84cd5a6cfbd607e73f8b2f522983520b18b1b63b (diff) | |
Reverted incorrect merge (missing files)
svn up -r 21247
svn merge -r 21247:21246 . (<= revert incorrect: merge -r 21041:21243)
svn up
Diffstat (limited to 'source/blender/blenkernel/BKE_utildefines.h')
| -rw-r--r-- | source/blender/blenkernel/BKE_utildefines.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/source/blender/blenkernel/BKE_utildefines.h b/source/blender/blenkernel/BKE_utildefines.h index 419f0f5beeb..6584af085cd 100644 --- a/source/blender/blenkernel/BKE_utildefines.h +++ b/source/blender/blenkernel/BKE_utildefines.h @@ -130,7 +130,7 @@ #define IN_RANGE(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) +#if !defined(WIN32) && !defined(__BeOS) #ifndef O_BINARY #define O_BINARY 0 #endif @@ -148,6 +148,12 @@ #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','_') |