diff options
| author | Joshua Leung <aligorith@gmail.com> | 2009-07-11 07:23:45 +0400 |
|---|---|---|
| committer | Joshua Leung <aligorith@gmail.com> | 2009-07-11 07:23:45 +0400 |
| commit | 576a642ff9b5ca5094f5bb84ada3c5639ae01a92 (patch) | |
| tree | 950a5f5ce861a8fa04fb2727e0e65a464ccbab9c /source/blender/makesrna/RNA_types.h | |
| parent | 1105ee701ed20d6301a174fc4285de00f8e0f95e (diff) | |
| parent | b80b581bc03b6df28bd3a10118d85b78d5ca011b (diff) | |
NLA SoC: Merge from 2.5 soc-2009-aligorith
21470 to 21512
Next up, NLA-branch to 2.5 :)
Diffstat (limited to 'source/blender/makesrna/RNA_types.h')
| -rw-r--r-- | source/blender/makesrna/RNA_types.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/makesrna/RNA_types.h b/source/blender/makesrna/RNA_types.h index 98646acd727..dc2a2a1a1de 100644 --- a/source/blender/makesrna/RNA_types.h +++ b/source/blender/makesrna/RNA_types.h @@ -157,7 +157,7 @@ typedef struct EnumPropertyItem { const char *description; } EnumPropertyItem; -typedef EnumPropertyItem *(*EnumPropertyItemFunc)(PointerRNA *ptr); +typedef EnumPropertyItem *(*EnumPropertyItemFunc)(struct bContext *C, PointerRNA *ptr, int *free); typedef struct PropertyRNA PropertyRNA; |