diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-08-02 04:10:05 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-08-02 04:10:05 +0400 |
| commit | 4ea2fb8b0a13ca74821b6705c683f31eafcd57ae (patch) | |
| tree | 7e76e6fc3688a858dbb51966dbbb38a012c7fcd9 /source/blender/makesdna/intern | |
| parent | 40e3dfd3bd1ff22d293df1d9d7b1b9b90d9bd708 (diff) | |
| parent | 6a6bcea81765976e902a4bac99ff9cbcd0faed55 (diff) | |
Merged changes in the trunk up to revision 49478.
Conflicts resolved:
source/blender/blenkernel/intern/library.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/interface/resources.c
source/blender/makesrna/intern/rna_scene.c
Diffstat (limited to 'source/blender/makesdna/intern')
| -rw-r--r-- | source/blender/makesdna/intern/makesdna.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/makesdna/intern/makesdna.c b/source/blender/makesdna/intern/makesdna.c index ab320322f83..bd1266bba81 100644 --- a/source/blender/makesdna/intern/makesdna.c +++ b/source/blender/makesdna/intern/makesdna.c @@ -293,7 +293,7 @@ static int add_name(const char *str) if (str[0] == '(' && str[1] == '*') { /* we handle function pointer and special array cases here, e.g. * void (*function)(...) and float (*array)[..]. the array case - * name is still converted to (array*)() though because it is that + * name is still converted to (array *)() though because it is that * way in old dna too, and works correct with elementsize() */ int isfuncptr = (strchr(str + 1, '(')) != NULL; |