diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-01-07 12:47:05 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-01-07 12:47:05 +0300 |
| commit | 41c00063dd43f1a653747129bdb29dcdb13818dd (patch) | |
| tree | 7814391c344f93b367deb1f338b8b2a96b05efbb /source/blender | |
| parent | 7fe16a24a4f9c8d53bff5e11fdb9fb3d60a4b898 (diff) | |
another error in commit r34143, was using the define's 'BLEN' & 'DER_' however the latter is incorrect since DER- is used for 64bit blend files.
removed the define.
Diffstat (limited to 'source/blender')
| -rw-r--r-- | source/blender/blenkernel/BKE_utildefines.h | 2 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/exotic.c | 7 |
2 files changed, 3 insertions, 6 deletions
diff --git a/source/blender/blenkernel/BKE_utildefines.h b/source/blender/blenkernel/BKE_utildefines.h index f152ff16afb..46746bbb4a3 100644 --- a/source/blender/blenkernel/BKE_utildefines.h +++ b/source/blender/blenkernel/BKE_utildefines.h @@ -204,8 +204,6 @@ do { \ #define ID_NEW(a) if( (a) && (a)->id.newid ) (a)= (void *)(a)->id.newid #define BLEN MAKE_ID('B','L','E','N') -#define DER_ MAKE_ID('D','E','R','_') -#define V100 MAKE_ID('V','1','0','0') #define DATA MAKE_ID('D','A','T','A') #define GLOB MAKE_ID('G','L','O','B') diff --git a/source/blender/blenkernel/intern/exotic.c b/source/blender/blenkernel/intern/exotic.c index 2c08e772a1a..d19226b2478 100644 --- a/source/blender/blenkernel/intern/exotic.c +++ b/source/blender/blenkernel/intern/exotic.c @@ -458,7 +458,7 @@ int BKE_read_exotic(Scene *scene, const char *name) { int len; gzFile gzfile; - int head[2]; + char header[7]; int retval; // make sure we're not trying to read a directory.... @@ -474,10 +474,9 @@ int BKE_read_exotic(Scene *scene, const char *name) retval= BKE_READ_EXOTIC_FAIL_OPEN; } else { - len= gzread(gzfile, head, sizeof(head)); + len= gzread(gzfile, header, sizeof(header)); gzclose(gzfile); - - if (len == sizeof(head) && (head[0] == BLEN && head[1] == DER_)) { + if (len == sizeof(header) && strncmp(header, "BLENDER", 7) == 0) { retval= BKE_READ_EXOTIC_OK_BLEND; } else { |