diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2011-11-21 01:02:12 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2011-11-21 01:02:12 +0400 |
| commit | 2676f2d58f71f438008b413a86b873e7787d80ea (patch) | |
| tree | eb541972cf32d5958b7c0f7f8ece525b78cfcbff /source/blender/makesdna/DNA_ID.h | |
| parent | bb9976f058ba2090812074e1b774213d20821a30 (diff) | |
| parent | 4ab1dadf72a821b344a714fff59aed11d15ecb14 (diff) | |
Merged changes in the trunk up to revision 42021.
Conflicts resolved:
source/blender/blenkernel/intern/scene.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/interface/resources.c
source/blender/render/intern/source/pipeline.c
Diffstat (limited to 'source/blender/makesdna/DNA_ID.h')
| -rw-r--r-- | source/blender/makesdna/DNA_ID.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/source/blender/makesdna/DNA_ID.h b/source/blender/makesdna/DNA_ID.h index 67171c35ca3..234dc125c6e 100644 --- a/source/blender/makesdna/DNA_ID.h +++ b/source/blender/makesdna/DNA_ID.h @@ -80,6 +80,13 @@ typedef struct IDProperty { #define IDP_IDPARRAY 9 #define IDP_NUMTYPES 10 +/*->subtype */ + +/* IDP_STRING */ +#define IDP_STRING_SUB_UTF8 0 /* default */ +#define IDP_STRING_SUB_BYTE 1 /* arbitrary byte array, _not_ null terminated */ + + /* add any future new id property types here.*/ /* watch it: Sequence has identical beginning. */ |