diff options
| author | Joshua Leung <aligorith@gmail.com> | 2009-06-22 08:39:35 +0400 |
|---|---|---|
| committer | Joshua Leung <aligorith@gmail.com> | 2009-06-22 08:39:35 +0400 |
| commit | aa267976b86f90423204e11a30eec4e0def0f296 (patch) | |
| tree | e1b09c017eef0191473b9aa1e59fd08ffe705f43 /source/blender/blenkernel/BKE_utildefines.h | |
| parent | f1fb09a493b79e6320a651a035203dff98c3b580 (diff) | |
| parent | 1efffc1f564af0597512699890d7be9f41a6aee2 (diff) | |
NLA SoC: Merge from 2.5
21043 to 21072
(NOTE TO SELF: Campbell made a commit in 2.5 before this merge finished)
Diffstat (limited to 'source/blender/blenkernel/BKE_utildefines.h')
| -rw-r--r-- | source/blender/blenkernel/BKE_utildefines.h | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/source/blender/blenkernel/BKE_utildefines.h b/source/blender/blenkernel/BKE_utildefines.h index 0bed2c095e2..f6c305b202d 100644 --- a/source/blender/blenkernel/BKE_utildefines.h +++ b/source/blender/blenkernel/BKE_utildefines.h @@ -131,7 +131,7 @@ #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 @@ -149,12 +149,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','_') |