diff options
author | Joseph Eagar <joeedh@gmail.com> | 2010-09-07 09:47:34 +0400 |
---|---|---|
committer | Joseph Eagar <joeedh@gmail.com> | 2010-09-07 09:47:34 +0400 |
commit | 82432d0d99f2101ee2ceba86bdc49669b5fa306f (patch) | |
tree | ada47d0a65cb7614ead93fcdbb3421e5398ff3dc /source/blender/blenkernel/BKE_customdata.h | |
parent | 859c5a42f0fe8b9bec0d3ddce1612942942619a7 (diff) | |
parent | 8a320974f1b3e6004db3b3ad64f97742f878cbee (diff) |
merge from trunk at r31523
Diffstat (limited to 'source/blender/blenkernel/BKE_customdata.h')
-rw-r--r-- | source/blender/blenkernel/BKE_customdata.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/BKE_customdata.h b/source/blender/blenkernel/BKE_customdata.h index ae38d4b4a41..7e59aa5ac8e 100644 --- a/source/blender/blenkernel/BKE_customdata.h +++ b/source/blender/blenkernel/BKE_customdata.h @@ -117,7 +117,7 @@ void *CustomData_add_layer(struct CustomData *data, int type, int alloctype, void *layer, int totelem); /*same as above but accepts a name */ void *CustomData_add_layer_named(struct CustomData *data, int type, int alloctype, - void *layer, int totelem, char *name); + void *layer, int totelem, const char *name); /* frees the active or first data layer with the give type. * returns 1 on succes, 0 if no layer with the given type is found |