diff options
author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-01-01 01:09:26 +0400 |
---|---|---|
committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-01-01 01:09:26 +0400 |
commit | cc3adc2202ce0208b1c95bc3fe3f0290b3b511f9 (patch) | |
tree | 503d6bc4376b27a6efe73739609e9bbb1f1188cb /source/blender/makesdna/DNA_ID.h | |
parent | 0896a227232f741b6028219a208ae60e78515406 (diff) | |
parent | b5595298d36a5023cc33ed41463fd6c032f2ec7b (diff) |
Merged changes in the trunk up to revision 43038.
Conflicts resolved:
source/blender/makesdna/DNA_material_types.h
source/blenderplayer/bad_level_call_stubs/stubs.c
Diffstat (limited to 'source/blender/makesdna/DNA_ID.h')
-rw-r--r-- | source/blender/makesdna/DNA_ID.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/source/blender/makesdna/DNA_ID.h b/source/blender/makesdna/DNA_ID.h index 234dc125c6e..a33aabab36d 100644 --- a/source/blender/makesdna/DNA_ID.h +++ b/source/blender/makesdna/DNA_ID.h @@ -24,14 +24,15 @@ * * ***** END GPL LICENSE BLOCK ***** */ -#ifndef DNA_ID_H -#define DNA_ID_H /** \file DNA_ID.h * \ingroup DNA * \brief ID and Library types, which are fundamental for sdna. */ +#ifndef DNA_ID_H +#define DNA_ID_H + #include "DNA_listBase.h" #ifdef __cplusplus @@ -57,7 +58,7 @@ typedef struct IDProperty { seemed like a good idea as a pad var was needed anyway :)*/ IDPropertyData data; /* note, alignment for 64 bits */ int len; /* array length, also (this is important!) string length + 1. - the idea is to be able to reuse array realloc functions on strings.*/ + * the idea is to be able to reuse array realloc functions on strings.*/ /* totallen is total length of allocated array/string, including a buffer. * Note that the buffering is mild; the code comes from python's list implementation.*/ int totallen; /*strings and arrays are both buffered, though the buffer isn't @@ -74,7 +75,7 @@ typedef struct IDProperty { #define IDP_ARRAY 5 #define IDP_GROUP 6 /* the ID link property type hasn't been implemented yet, this will require - some cleanup of blenkernel, most likely.*/ + * some cleanup of blenkernel, most likely.*/ #define IDP_ID 7 #define IDP_DOUBLE 8 #define IDP_IDPARRAY 9 |