diff options
| author | Arystanbek Dyussenov <arystan.d@gmail.com> | 2010-09-04 22:49:07 +0400 |
|---|---|---|
| committer | Arystanbek Dyussenov <arystan.d@gmail.com> | 2010-09-04 22:49:07 +0400 |
| commit | 90b464d3728d9ed8ec26fdf59058d236b99dbcd9 (patch) | |
| tree | e88cab4fb1358e962b19f658064ca8c9f8d29f5b /source/blender/blenlib/BLI_bfile.h | |
| parent | 08d02dd04d836976b25793bb1d4c6a86b3f924c7 (diff) | |
| parent | b0b787ef38f9947b3176642556f5282eb3518f69 (diff) | |
COLLADA branch: merge from trunk -r 28015:31610.soc-2009-chingachgook
Diffstat (limited to 'source/blender/blenlib/BLI_bfile.h')
| -rw-r--r-- | source/blender/blenlib/BLI_bfile.h | 37 |
1 files changed, 15 insertions, 22 deletions
diff --git a/source/blender/blenlib/BLI_bfile.h b/source/blender/blenlib/BLI_bfile.h index 8c93e03c881..71e771fb4fa 100644 --- a/source/blender/blenlib/BLI_bfile.h +++ b/source/blender/blenlib/BLI_bfile.h @@ -1,4 +1,5 @@ -/* +/* -*- indent-tabs-mode:t; tab-width:4; -*- + * * $Id$ * * ***** BEGIN GPL LICENSE BLOCK ***** @@ -33,33 +34,26 @@ /** Defines for the bflags param. */ -/* Special handling: */ +/* Special handling, pick one of: */ /* For "symmetry" of flags */ #define BFILE_NORMAL (0) /* No supervision, just translate // if needed, RISKY */ #define BFILE_RAW (1<<0) -/* Path is based in env vars specified by "envvars" */ -#define BFILE_CONFIG (1<<1) /* Path is for current session temp files */ -#define BFILE_TEMP (1<<2) +#define BFILE_TEMP (1<<1) +/* Path is based in env vars of matching name */ +#define BFILE_CONFIG_BASE (1<<2) +#define BFILE_CONFIG_DATAFILES (1<<3) +#define BFILE_CONFIG_PYTHON (1<<4) +#define BFILE_CONFIG_PLUGINS (1<<5) /* Config handling, special cases: */ -#define BFILE_USERONLY (1<<3) -#define BFILE_SYSONLY (1<<4) +#define BFILE_USERONLY (1<<6) +#define BFILE_SYSONLY (1<<7) /* Compression to apply on close: */ -#define BFILE_GZIP (1<<5) - -/** - For the envvars param. - */ -typedef enum BEnvVarFamilies { - BENV_NONE, - BENV_BASE, - BENV_DATAFILES, - BENV_PYTHON, - BENV_PLUGINS -} BEnvVarFam; +#define BFILE_GZIP (1<<8) +#define BFILE_LZMA (1<<9) /** File descriptor for Blender abstracted file access. @@ -70,7 +64,6 @@ typedef struct { /* Anything below should not be touched directly */ int uflags; /* Special options requested by upper level, copy of bflags */ - BEnvVarFam evars; /* What kind of file, describe the env vars to use */ char *fpath; /* Final/requested path name */ char *tpath; /* Temp path name if applicable */ int classf; /* Own flags, common classification of open and fopen */ @@ -80,12 +73,12 @@ typedef struct { /** Open a BFILE* with fopen()-like syntax. */ -BFILE *BLI_bfile_fopen(const char *path, const char *mode, int bflags, BEnvVarFam envvars); +BFILE *BLI_bfile_fopen(const char *path, const char *mode, int bflags, const char *relpath); /** Open a BFILE* with open()-like syntax. */ -BFILE *BLI_bfile_open(const char *pathname, int flags, int bflags, BEnvVarFam envvars); +BFILE *BLI_bfile_open(const char *pathname, int flags, int bflags, const char *relpath); /** Get the FILE* associated with the BFILE*. |