diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-07-21 03:12:05 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-07-21 03:12:05 +0400 |
| commit | 3b012c041f1fb7b78eddcf1f93288cf7a86ab8d6 (patch) | |
| tree | cead235bff7687610b1372e709e742ef70692dcb /source/blender/makesdna/intern | |
| parent | 5a581c1fd116c51df13e09c5c320feba48d069bb (diff) | |
| parent | 16516238e2b25ce53144c2dcea5323dc7313b724 (diff) | |
Merged changes in the trunk up to revision 49090.
Diffstat (limited to 'source/blender/makesdna/intern')
| -rw-r--r-- | source/blender/makesdna/intern/dna_genfile.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/makesdna/intern/dna_genfile.c b/source/blender/makesdna/intern/dna_genfile.c index 8be743335cc..f5cf7e3ea3b 100644 --- a/source/blender/makesdna/intern/dna_genfile.c +++ b/source/blender/makesdna/intern/dna_genfile.c @@ -105,7 +105,7 @@ typedef long long __int64; * - location within a struct (everthing can be randomly mixed up) * - struct within struct (within struct etc), this is recursive * - adding new elements, will be default initialized zero - * - remving elements + * - removing elements * - change of array sizes * - change of a pointer type: when the name doesn't change the contents is copied * @@ -122,7 +122,7 @@ typedef long long __int64; * - only use a long in Blender if you want this to be the size of a pointer. so it is * 32 bits or 64 bits, dependent at the cpu architecture * - chars are always unsigned - * - aligment of variables has to be done in such a way, that any system does + * - alignment of variables has to be done in such a way, that any system does * not create 'padding' (gaps) in structures. So make sure that: * - short: 2 aligned * - int: 4 aligned @@ -556,7 +556,7 @@ static void recurs_test_compflags(SDNA *sdna, char *compflags, int structnr) /* Unsure of exact function - compares the sdna argument to * newsdna and sets up the information necessary to convert - * data written with a dna of oldsdna to inmemory data with a + * data written with a dna of oldsdna to in-memory data with a * structure defined by the newsdna sdna (I think). -zr */ |