use bool for rna funcs.
[blender.git] / source / blender / makesrna / intern / makesrna.c
index 1a4e8b3d5a70fa6ede8e5f563111ce5af83e83e6..f3891c20ab55b00e1202a8eff5318c8f33dbf063 100644 (file)
@@ -24,7 +24,6 @@
  *  \ingroup RNA
  */
 
-
 #include <float.h>
 #include <limits.h>
 #include <stdio.h>
@@ -34,6 +33,8 @@
 
 #include "MEM_guardedalloc.h"
 
+#include "BLI_utildefines.h"
+
 #include "RNA_access.h"
 #include "RNA_define.h"
 #include "RNA_types.h"
 #  define __func__ __FUNCTION__
 #endif
 
+/* copied from BLI_utildefines.h ugh */
+#ifdef __GNUC__
+#  define UNUSED(x) UNUSED_ ## x __attribute__((__unused__))
+#else
+#  define UNUSED(x) x
+#endif
+
 /* Replace if different */
 #define TMP_EXT ".tmp"
 
-
 /* copied from BLI_file_older */
 #include <sys/stat.h>
 static int file_older(const char *file1, const char *file2)
@@ -69,6 +76,24 @@ static int file_older(const char *file1, const char *file2)
 }
 static const char *makesrna_path = NULL;
 
+/* forward declarations */
+static void rna_generate_static_parameter_prototypes(FILE *f, StructRNA *srna, FunctionDefRNA *dfunc,
+                                                     const char *name_override, int close_prototype);
+
+/* helpers */
+#define WRITE_COMMA \
+       { \
+               if (!first) \
+                       fprintf(f, ", "); \
+               first = 0; \
+       } (void)0
+
+#define WRITE_PARAM(param) \
+       { \
+               WRITE_COMMA; \
+               fprintf(f, param); \
+       } (void)0
+
 static int replace_if_different(char *tmpfile, const char *dep_files[])
 {
        /* return 0;  *//* use for testing had edited rna */
@@ -139,7 +164,7 @@ static int replace_if_different(char *tmpfile, const char *dep_files[])
                                /* dir only */
                                p1 = strrchr(from_path, '/');
                                p2 = strrchr(from_path, '\\');
-                               strcpy((p1 > p2 ? p1 : p2)+1, dep_files[pass]);
+                               strcpy((p1 > p2 ? p1 : p2) + 1, dep_files[pass]);
                                /* account for build deps, if makesrna.c (this file) is newer */
                                if (file_older(orgfile, from_path)) {
                                        REN_IF_DIFF;
@@ -170,8 +195,8 @@ static int replace_if_different(char *tmpfile, const char *dep_files[])
        }
 
        /* now compare the files... */
-       arr_new = MEM_mallocN(sizeof(char)*len_new, "rna_cmp_file_new");
-       arr_org = MEM_mallocN(sizeof(char)*len_org, "rna_cmp_file_org");
+       arr_new = MEM_mallocN(sizeof(char) * len_new, "rna_cmp_file_new");
+       arr_org = MEM_mallocN(sizeof(char) * len_org, "rna_cmp_file_org");
 
        if (fread(arr_new, sizeof(char), len_new, fp_new) != len_new)
                fprintf(stderr, "%s:%d, error reading file %s for comparison.\n", __FILE__, __LINE__, tmpfile);
@@ -205,6 +230,8 @@ static const char *rna_safe_id(const char *id)
                return "default_value";
        else if (strcmp(id, "operator") == 0)
                return "operator_value";
+       else if (strcmp(id, "new") == 0)
+               return "create";
 
        return id;
 }
@@ -213,16 +240,16 @@ static const char *rna_safe_id(const char *id)
 
 static int cmp_struct(const void *a, const void *b)
 {
-       const StructRNA *structa = *(const StructRNA**)a;
-       const StructRNA *structb = *(const StructRNA**)b;
+       const StructRNA *structa = *(const StructRNA **)a;
+       const StructRNA *structb = *(const StructRNA **)b;
 
        return strcmp(structa->identifier, structb->identifier);
 }
 
 static int cmp_property(const void *a, const void *b)
 {
-       const PropertyRNA *propa = *(const PropertyRNA**)a;
-       const PropertyRNA *propb = *(const PropertyRNA**)b;
+       const PropertyRNA *propa = *(const PropertyRNA **)a;
+       const PropertyRNA *propb = *(const PropertyRNA **)b;
 
        if (strcmp(propa->identifier, "rna_type") == 0) return -1;
        else if (strcmp(propb->identifier, "rna_type") == 0) return 1;
@@ -235,21 +262,21 @@ static int cmp_property(const void *a, const void *b)
 
 static int cmp_def_struct(const void *a, const void *b)
 {
-       const StructDefRNA *dsa = *(const StructDefRNA**)a;
-       const StructDefRNA *dsb = *(const StructDefRNA**)b;
+       const StructDefRNA *dsa = *(const StructDefRNA **)a;
+       const StructDefRNA *dsb = *(const StructDefRNA **)b;
 
        return cmp_struct(&dsa->srna, &dsb->srna);
 }
 
 static int cmp_def_property(const void *a, const void *b)
 {
-       const PropertyDefRNA *dpa = *(const PropertyDefRNA**)a;
-       const PropertyDefRNA *dpb = *(const PropertyDefRNA**)b;
+       const PropertyDefRNA *dpa = *(const PropertyDefRNA **)a;
+       const PropertyDefRNA *dpb = *(const PropertyDefRNA **)b;
 
        return cmp_property(&dpa->prop, &dpb->prop);
 }
 
-static void rna_sortlist(ListBase *listbase, int(*cmp)(const void*, const void*))
+static void rna_sortlist(ListBase *listbase, int (*cmp)(const void *, const void *))
 {
        Link *link;
        void **array;
@@ -261,14 +288,14 @@ static void rna_sortlist(ListBase *listbase, int(*cmp)(const void*, const void*)
        for (size = 0, link = listbase->first; link; link = link->next)
                size++;
 
-       array = MEM_mallocN(sizeof(void*)*size, "rna_sortlist");
+       array = MEM_mallocN(sizeof(void *) * size, "rna_sortlist");
        for (a = 0, link = listbase->first; link; link = link->next, a++)
                array[a] = link;
 
-       qsort(array, size, sizeof(void*), cmp);
+       qsort(array, size, sizeof(void *), cmp);
 
        listbase->first = listbase->last = NULL;
-       for (a = 0; a<size; a++) {
+       for (a = 0; a < size; a++) {
                link = array[a];
                link->next = link->prev = NULL;
                rna_addtail(listbase, link);
@@ -310,19 +337,32 @@ static void rna_print_data_get(FILE *f, PropertyDefRNA *dp)
                fprintf(f, "    %s *data= (%s*)(ptr->data);\n", dp->dnastructname, dp->dnastructname);
 }
 
-static void rna_print_id_get(FILE *f, PropertyDefRNA *dp)
+static void rna_print_id_get(FILE *f, PropertyDefRNA *UNUSED(dp))
 {
        fprintf(f, "    ID *id= ptr->id.data;\n");
 }
 
+static void rna_construct_function_name(char *buffer, int size, const char *structname, const char *propname, const char *type)
+{
+       snprintf(buffer, size, "%s_%s_%s", structname, propname, type);
+}
+
+static void rna_construct_wrapper_function_name(char *buffer, int size, const char *structname, const char *propname, const char *type)
+{
+       if (type == NULL || type[0] == '\0')
+               snprintf(buffer, size, "%s_%s", structname, propname);
+       else
+               snprintf(buffer, size, "%s_%s_%s", structname, propname, type);
+}
+
 static char *rna_alloc_function_name(const char *structname, const char *propname, const char *type)
 {
        AllocDefRNA *alloc;
        char buffer[2048];
        char *result;
 
-       snprintf(buffer, sizeof(buffer), "%s_%s_%s", structname, propname, type);
-       result = MEM_callocN(sizeof(char)*strlen(buffer)+1, "rna_alloc_function_name");
+       rna_construct_function_name(buffer, sizeof(buffer), structname, propname, type);
+       result = MEM_callocN(sizeof(char) * strlen(buffer) + 1, "rna_alloc_function_name");
        strcpy(result, buffer);
 
        alloc = MEM_callocN(sizeof(AllocDefRNA), "AllocDefRNA");
@@ -376,10 +416,10 @@ static const char *rna_type_type_name(PropertyRNA *prop)
                        return "float";
                case PROP_STRING:
                        if (prop->flag & PROP_THICK_WRAP) {
-                               return "char*";
+                               return "char *";
                        }
                        else {
-                               return "const char*";
+                               return "const char *";
                        }
                default:
                        return NULL;
@@ -420,15 +460,17 @@ static const char *rna_parameter_type_name(PropertyRNA *parm)
                return type;
 
        switch (parm->type) {
-               case PROP_POINTER:  {
-                       PointerPropertyRNA *pparm = (PointerPropertyRNA*)parm;
+               case PROP_POINTER:
+               {
+                       PointerPropertyRNA *pparm = (PointerPropertyRNA *)parm;
 
                        if (parm->flag & PROP_RNAPTR)
                                return "PointerRNA";
                        else
                                return rna_find_dna_type((const char *)pparm->type);
                }
-               case PROP_COLLECTION: {
+               case PROP_COLLECTION:
+               {
                        return "ListBase";
                }
                default:
@@ -438,11 +480,11 @@ static const char *rna_parameter_type_name(PropertyRNA *parm)
 
 static int rna_enum_bitmask(PropertyRNA *prop)
 {
-       EnumPropertyRNA *eprop = (EnumPropertyRNA*)prop;
+       EnumPropertyRNA *eprop = (EnumPropertyRNA *)prop;
        int a, mask = 0;
 
        if (eprop->item) {
-               for (a = 0; a<eprop->totitem; a++)
+               for (a = 0; a < eprop->totitem; a++)
                        if (eprop->item[a].identifier[0])
                                mask |= eprop->item[a].value;
        }
@@ -459,7 +501,7 @@ static int rna_color_quantize(PropertyRNA *prop, PropertyDefRNA *dp)
 
 static const char *rna_function_string(void *func)
 {
-       return (func)? (const char*)func: "NULL";
+       return (func) ? (const char *)func : "NULL";
 }
 
 static void rna_float_print(FILE *f, float num)
@@ -523,8 +565,9 @@ static char *rna_def_property_get_func(FILE *f, StructRNA *srna, PropertyRNA *pr
        func = rna_alloc_function_name(srna->identifier, rna_safe_id(prop->identifier), "get");
 
        switch (prop->type) {
-               case PROP_STRING: {
-                       StringPropertyRNA *sprop = (StringPropertyRNA*)prop;
+               case PROP_STRING:
+               {
+                       StringPropertyRNA *sprop = (StringPropertyRNA *)prop;
                        fprintf(f, "void %s(PointerRNA *ptr, char *value)\n", func);
                        fprintf(f, "{\n");
                        if (manualfunc) {
@@ -533,10 +576,10 @@ static char *rna_def_property_get_func(FILE *f, StructRNA *srna, PropertyRNA *pr
                        else {
                                const PropertySubType subtype = prop->subtype;
                                const char *string_copy_func = (subtype == PROP_FILEPATH ||
-                                                              subtype == PROP_DIRPATH  ||
-                                                              subtype == PROP_FILENAME ||
-                                                              subtype == PROP_BYTESTRING) ?
-                                           "BLI_strncpy" : "BLI_strncpy_utf8";
+                                                               subtype == PROP_DIRPATH  ||
+                                                               subtype == PROP_FILENAME ||
+                                                               subtype == PROP_BYTESTRING) ?
+                                                              "BLI_strncpy" : "BLI_strncpy_utf8";
 
                                rna_print_data_get(f, dp);
 
@@ -556,27 +599,29 @@ static char *rna_def_property_get_func(FILE *f, StructRNA *srna, PropertyRNA *pr
                        fprintf(f, "}\n\n");
                        break;
                }
-               case PROP_POINTER: {
+               case PROP_POINTER:
+               {
                        fprintf(f, "PointerRNA %s(PointerRNA *ptr)\n", func);
                        fprintf(f, "{\n");
                        if (manualfunc) {
                                fprintf(f, "    return %s(ptr);\n", manualfunc);
                        }
                        else {
-                               PointerPropertyRNA *pprop = (PointerPropertyRNA*)prop;
+                               PointerPropertyRNA *pprop = (PointerPropertyRNA *)prop;
                                rna_print_data_get(f, dp);
                                if (dp->dnapointerlevel == 0)
                                        fprintf(f, "    return rna_pointer_inherit_refine(ptr, &RNA_%s, &data->%s);\n",
-                                               (const char*)pprop->type, dp->dnaname);
+                                               (const char *)pprop->type, dp->dnaname);
                                else
                                        fprintf(f, "    return rna_pointer_inherit_refine(ptr, &RNA_%s, data->%s);\n",
-                                               (const char*)pprop->type, dp->dnaname);
+                                               (const char *)pprop->type, dp->dnaname);
                        }
                        fprintf(f, "}\n\n");
                        break;
                }
-               case PROP_COLLECTION: {
-                       CollectionPropertyRNA *cprop = (CollectionPropertyRNA*)prop;
+               case PROP_COLLECTION:
+               {
+                       CollectionPropertyRNA *cprop = (CollectionPropertyRNA *)prop;
 
                        fprintf(f, "static PointerRNA %s(CollectionPropertyIterator *iter)\n", func);
                        fprintf(f, "{\n");
@@ -586,7 +631,7 @@ static char *rna_def_property_get_func(FILE *f, StructRNA *srna, PropertyRNA *pr
                                    strcmp(manualfunc, "rna_iterator_array_dereference_get") == 0)
                                {
                                        fprintf(f, "    return rna_pointer_inherit_refine(&iter->parent, &RNA_%s, %s(iter));\n",
-                                               (cprop->item_type) ? (const char *)cprop->item_type: "UnknownType", manualfunc);
+                                               (cprop->item_type) ? (const char *)cprop->item_type : "UnknownType", manualfunc);
                                }
                                else {
                                        fprintf(f, "    return %s(iter);\n", manualfunc);
@@ -615,42 +660,42 @@ static char *rna_def_property_get_func(FILE *f, StructRNA *srna, PropertyRNA *pr
                                                                                        "get_length");
                                                fprintf(f, "    int i, arraylen[RNA_MAX_ARRAY_DIMENSION];\n");
                                                fprintf(f, "    int len= %s(ptr, arraylen);\n\n", lenfunc);
-                                               fprintf(f, "    for (i=0; i<len; i++) {\n");
+                                               fprintf(f, "    for (i=0; i < len; i++) {\n");
                                                MEM_freeN(lenfunc);
                                        }
                                        else {
                                                fprintf(f, "    int i;\n\n");
-                                               fprintf(f, "    for (i=0; i<%u; i++) {\n", prop->totarraylength);
+                                               fprintf(f, "    for (i=0; i < %u; i++) {\n", prop->totarraylength);
                                        }
 
                                        if (dp->dnaarraylength == 1) {
                                                if (prop->type == PROP_BOOLEAN && dp->booleanbit) {
-                                                       fprintf(f, "            values[i]= %s((data->%s & (%d<<i)) != 0);\n",
-                                                               (dp->booleannegative)? "!": "", dp->dnaname, dp->booleanbit);
+                                                       fprintf(f, "            values[i] = %s((data->%s & (%d << i)) != 0);\n",
+                                                               (dp->booleannegative) ? "!" : "", dp->dnaname, dp->booleanbit);
                                                }
                                                else {
-                                                       fprintf(f, "            values[i]= (%s)%s((&data->%s)[i]);\n",
-                                                               rna_type_type(prop), (dp->booleannegative)? "!": "", dp->dnaname);
+                                                       fprintf(f, "            values[i] = (%s)%s((&data->%s)[i]);\n",
+                                                               rna_type_type(prop), (dp->booleannegative) ? "!" : "", dp->dnaname);
                                                }
                                        }
                                        else {
                                                if (prop->type == PROP_BOOLEAN && dp->booleanbit) {
-                                                       fprintf(f, "            values[i]= %s((data->%s[i] & ", (dp->booleannegative)? "!": "",
+                                                       fprintf(f, "            values[i] = %s((data->%s[i] & ", (dp->booleannegative) ? "!" : "",
                                                                dp->dnaname);
                                                        rna_int_print(f, dp->booleanbit);
                                                        fprintf(f, ") != 0);\n");
                                                }
                                                else if (rna_color_quantize(prop, dp)) {
-                                                       fprintf(f, "            values[i]= (%s)(data->%s[i]*(1.0f/255.0f));\n",
+                                                       fprintf(f, "            values[i] = (%s)(data->%s[i]*(1.0f / 255.0f));\n",
                                                                rna_type_type(prop), dp->dnaname);
                                                }
                                                else if (dp->dnatype) {
-                                                       fprintf(f, "            values[i]= (%s)%s(((%s*)data->%s)[i]);\n",
-                                                               rna_type_type(prop), (dp->booleannegative)? "!": "", dp->dnatype, dp->dnaname);
+                                                       fprintf(f, "            values[i] = (%s)%s(((%s*)data->%s)[i]);\n",
+                                                               rna_type_type(prop), (dp->booleannegative) ? "!" : "", dp->dnatype, dp->dnaname);
                                                }
                                                else {
-                                                       fprintf(f, "            values[i]= (%s)%s((data->%s)[i]);\n",
-                                                               rna_type_type(prop), (dp->booleannegative)? "!": "", dp->dnaname);
+                                                       fprintf(f, "            values[i] = (%s)%s((data->%s)[i]);\n",
+                                                               rna_type_type(prop), (dp->booleannegative) ? "!" : "", dp->dnaname);
                                                }
                                        }
                                        fprintf(f, "    }\n");
@@ -667,7 +712,7 @@ static char *rna_def_property_get_func(FILE *f, StructRNA *srna, PropertyRNA *pr
                                else {
                                        rna_print_data_get(f, dp);
                                        if (prop->type == PROP_BOOLEAN && dp->booleanbit) {
-                                               fprintf(f, "    return %s(((data->%s) & ", (dp->booleannegative)? "!": "", dp->dnaname);
+                                               fprintf(f, "    return %s(((data->%s) & ", (dp->booleannegative) ? "!" : "", dp->dnaname);
                                                rna_int_print(f, dp->booleanbit);
                                                fprintf(f, ") != 0);\n");
                                        }
@@ -678,7 +723,7 @@ static char *rna_def_property_get_func(FILE *f, StructRNA *srna, PropertyRNA *pr
                                        }
                                        else
                                                fprintf(f, "    return (%s)%s(data->%s);\n", rna_type_type(prop),
-                                                       (dp->booleannegative)? "!": "", dp->dnaname);
+                                                       (dp->booleannegative) ? "!" : "", dp->dnaname);
                                }
 
                                fprintf(f, "}\n\n");
@@ -693,7 +738,7 @@ static char *rna_def_property_get_func(FILE *f, StructRNA *srna, PropertyRNA *pr
 static void rna_clamp_value_range(FILE *f, PropertyRNA *prop)
 {
        if (prop->type == PROP_FLOAT) {
-               FloatPropertyRNA *fprop = (FloatPropertyRNA*)prop;
+               FloatPropertyRNA *fprop = (FloatPropertyRNA *)prop;
                if (fprop->range) {
                        fprintf(f,
                                "       float prop_clamp_min = -FLT_MAX, prop_clamp_max = FLT_MAX, prop_soft_min, prop_soft_max;\n");
@@ -702,7 +747,7 @@ static void rna_clamp_value_range(FILE *f, PropertyRNA *prop)
                }
        }
        else if (prop->type == PROP_INT) {
-               IntPropertyRNA *iprop = (IntPropertyRNA*)prop;
+               IntPropertyRNA *iprop = (IntPropertyRNA *)prop;
                if (iprop->range) {
                        fprintf(f, "    int prop_clamp_min = INT_MIN, prop_clamp_max = INT_MAX, prop_soft_min, prop_soft_max;\n");
                        fprintf(f, "    %s(ptr, &prop_clamp_min, &prop_clamp_max, &prop_soft_min, &prop_soft_max);\n",
@@ -714,9 +759,9 @@ static void rna_clamp_value_range(FILE *f, PropertyRNA *prop)
 static void rna_clamp_value(FILE *f, PropertyRNA *prop, int array)
 {
        if (prop->type == PROP_INT) {
-               IntPropertyRNA *iprop = (IntPropertyRNA*)prop;
+               IntPropertyRNA *iprop = (IntPropertyRNA *)prop;
 
-               if (iprop->hardmin != INT_MIN || iprop->hardmax != INT_MAX) {
+               if (iprop->hardmin != INT_MIN || iprop->hardmax != INT_MAX || iprop->range) {
                        if (array) fprintf(f, "CLAMPIS(values[i], ");
                        else fprintf(f, "CLAMPIS(value, ");
                        if (iprop->range) {
@@ -730,9 +775,9 @@ static void rna_clamp_value(FILE *f, PropertyRNA *prop, int array)
                }
        }
        else if (prop->type == PROP_FLOAT) {
-               FloatPropertyRNA *fprop = (FloatPropertyRNA*)prop;
+               FloatPropertyRNA *fprop = (FloatPropertyRNA *)prop;
 
-               if (fprop->hardmin != -FLT_MAX || fprop->hardmax != FLT_MAX) {
+               if (fprop->hardmin != -FLT_MAX || fprop->hardmax != FLT_MAX || fprop->range) {
                        if (array) fprintf(f, "CLAMPIS(values[i], ");
                        else fprintf(f, "CLAMPIS(value, ");
                        if (fprop->range) {
@@ -776,8 +821,9 @@ static char *rna_def_property_set_func(FILE *f, StructRNA *srna, PropertyRNA *pr
        func = rna_alloc_function_name(srna->identifier, rna_safe_id(prop->identifier), "set");
 
        switch (prop->type) {
-               case PROP_STRING: {
-                       StringPropertyRNA *sprop = (StringPropertyRNA*)prop;
+               case PROP_STRING:
+               {
+                       StringPropertyRNA *sprop = (StringPropertyRNA *)prop;
                        fprintf(f, "void %s(PointerRNA *ptr, const char *value)\n", func);
                        fprintf(f, "{\n");
                        if (manualfunc) {
@@ -786,10 +832,10 @@ static char *rna_def_property_set_func(FILE *f, StructRNA *srna, PropertyRNA *pr
                        else {
                                const PropertySubType subtype = prop->subtype;
                                const char *string_copy_func = (subtype == PROP_FILEPATH ||
-                                                              subtype == PROP_DIRPATH  ||
-                                                              subtype == PROP_FILENAME ||
-                                                              subtype == PROP_BYTESTRING) ?
-                                           "BLI_strncpy" : "BLI_strncpy_utf8";
+                                                               subtype == PROP_DIRPATH  ||
+                                                               subtype == PROP_FILENAME ||
+                                                               subtype == PROP_BYTESTRING) ?
+                                                              "BLI_strncpy" : "BLI_strncpy_utf8";
 
                                rna_print_data_get(f, dp);
 
@@ -808,7 +854,8 @@ static char *rna_def_property_set_func(FILE *f, StructRNA *srna, PropertyRNA *pr
                        fprintf(f, "}\n\n");
                        break;
                }
-               case PROP_POINTER: {
+               case PROP_POINTER:
+               {
                        fprintf(f, "void %s(PointerRNA *ptr, PointerRNA value)\n", func);
                        fprintf(f, "{\n");
                        if (manualfunc) {
@@ -819,25 +866,25 @@ static char *rna_def_property_set_func(FILE *f, StructRNA *srna, PropertyRNA *pr
 
                                if (prop->flag & PROP_ID_SELF_CHECK) {
                                        rna_print_id_get(f, dp);
-                                       fprintf(f, "    if (id==value.data) return;\n\n");
+                                       fprintf(f, "    if (id == value.data) return;\n\n");
                                }
 
                                if (prop->flag & PROP_ID_REFCOUNT) {
                                        fprintf(f, "\n  if (data->%s)\n", dp->dnaname);
-                                       fprintf(f, "            id_us_min((ID*)data->%s);\n", dp->dnaname);
+                                       fprintf(f, "            id_us_min((ID *)data->%s);\n", dp->dnaname);
                                        fprintf(f, "    if (value.data)\n");
-                                       fprintf(f, "            id_us_plus((ID*)value.data);\n\n");
+                                       fprintf(f, "            id_us_plus((ID *)value.data);\n\n");
                                }
                                else {
-                                       PointerPropertyRNA *pprop = (PointerPropertyRNA*)dp->prop;
-                                       StructRNA *type = rna_find_struct((const char*)pprop->type);
+                                       PointerPropertyRNA *pprop = (PointerPropertyRNA *)dp->prop;
+                                       StructRNA *type = rna_find_struct((const char *)pprop->type);
                                        if (type && (type->flag & STRUCT_ID)) {
                                                fprintf(f, "    if (value.data)\n");
-                                               fprintf(f, "            id_lib_extern((ID*)value.data);\n\n");
+                                               fprintf(f, "            id_lib_extern((ID *)value.data);\n\n");
                                        }
                                }
 
-                               fprintf(f, "    data->%s= value.data;\n", dp->dnaname);
+                               fprintf(f, "    data->%s = value.data;\n", dp->dnaname);
 
                        }
                        fprintf(f, "}\n\n");
@@ -864,23 +911,23 @@ static char *rna_def_property_set_func(FILE *f, StructRNA *srna, PropertyRNA *pr
                                                fprintf(f, "    int i, arraylen[RNA_MAX_ARRAY_DIMENSION];\n");
                                                fprintf(f, "    int len= %s(ptr, arraylen);\n\n", lenfunc);
                                                rna_clamp_value_range(f, prop);
-                                               fprintf(f, "    for (i=0; i<len; i++) {\n");
+                                               fprintf(f, "    for (i=0; i < len; i++) {\n");
                                                MEM_freeN(lenfunc);
                                        }
                                        else {
                                                fprintf(f, "    int i;\n\n");
                                                rna_clamp_value_range(f, prop);
-                                               fprintf(f, "    for (i=0; i<%u; i++) {\n", prop->totarraylength);
+                                               fprintf(f, "    for (i=0; i < %u; i++) {\n", prop->totarraylength);
                                        }
 
                                        if (dp->dnaarraylength == 1) {
                                                if (prop->type == PROP_BOOLEAN && dp->booleanbit) {
                                                        fprintf(f, "            if (%svalues[i]) data->%s |= (%d<<i);\n",
-                                                               (dp->booleannegative)? "!": "", dp->dnaname, dp->booleanbit);
-                                                       fprintf(f, "            else data->%s &= ~(%d<<i);\n", dp->dnaname, dp->booleanbit);
+                                                               (dp->booleannegative) ? "!" : "", dp->dnaname, dp->booleanbit);
+                                                       fprintf(f, "            else data->%s &= ~(%d << i);\n", dp->dnaname, dp->booleanbit);
                                                }
                                                else {
-                                                       fprintf(f, "            (&data->%s)[i]= %s", dp->dnaname, (dp->booleannegative) ? "!" : "");
+                                                       fprintf(f, "            (&data->%s)[i] = %s", dp->dnaname, (dp->booleannegative) ? "!" : "");
                                                        rna_clamp_value(f, prop, 1);
                                                }
                                        }
@@ -895,14 +942,14 @@ static char *rna_def_property_set_func(FILE *f, StructRNA *srna, PropertyRNA *pr
                                                        fprintf(f, ";\n");
                                                }
                                                else if (rna_color_quantize(prop, dp)) {
-                                                       fprintf(f, "            data->%s[i]= FTOCHAR(values[i]);\n", dp->dnaname);
+                                                       fprintf(f, "            data->%s[i] = FTOCHAR(values[i]);\n", dp->dnaname);
                                                }
                                                else {
                                                        if (dp->dnatype)
-                                                               fprintf(f, "            ((%s*)data->%s)[i]= %s", dp->dnatype, dp->dnaname,
+                                                               fprintf(f, "            ((%s*)data->%s)[i] = %s", dp->dnatype, dp->dnaname,
                                                                        (dp->booleannegative) ? "!" : "");
                                                        else
-                                                               fprintf(f, "            (data->%s)[i]= %s", dp->dnaname, (dp->booleannegative) ? "!" : "");
+                                                               fprintf(f, "            (data->%s)[i] = %s", dp->dnaname, (dp->booleannegative) ? "!" : "");
                                                        rna_clamp_value(f, prop, 1);
                                                }
                                        }
@@ -935,7 +982,7 @@ static char *rna_def_property_set_func(FILE *f, StructRNA *srna, PropertyRNA *pr
                                        }
                                        else {
                                                rna_clamp_value_range(f, prop);
-                                               fprintf(f, "    data->%s= %s", dp->dnaname, (dp->booleannegative) ? "!" : "");
+                                               fprintf(f, "    data->%s = %s", dp->dnaname, (dp->booleannegative) ? "!" : "");
                                                rna_clamp_value(f, prop, 0);
                                        }
                                }
@@ -983,7 +1030,7 @@ static char *rna_def_property_length_func(FILE *f, StructRNA *srna, PropertyRNA
        }
        else if (prop->type == PROP_COLLECTION) {
                if (!manualfunc) {
-                       if (prop->type == PROP_COLLECTION && (!(dp->dnalengthname || dp->dnalengthfixed)|| !dp->dnaname)) {
+                       if (prop->type == PROP_COLLECTION && (!(dp->dnalengthname || dp->dnalengthfixed) || !dp->dnaname)) {
                                fprintf(stderr, "%s: %s.%s has no valid dna info.\n",
                                        __func__, srna->identifier, prop->identifier);
                                DefRNA.error = 1;
@@ -1001,9 +1048,9 @@ static char *rna_def_property_length_func(FILE *f, StructRNA *srna, PropertyRNA
                else {
                        rna_print_data_get(f, dp);
                        if (dp->dnalengthname)
-                               fprintf(f, "    return (data->%s == NULL)? 0: data->%s;\n", dp->dnaname, dp->dnalengthname);
+                               fprintf(f, "    return (data->%s == NULL) ? 0 : data->%s;\n", dp->dnaname, dp->dnalengthname);
                        else
-                               fprintf(f, "    return (data->%s == NULL)? 0: %d;\n", dp->dnaname, dp->dnalengthfixed);
+                               fprintf(f, "    return (data->%s == NULL) ? 0 : %d;\n", dp->dnaname, dp->dnalengthfixed);
                }
                fprintf(f, "}\n\n");
        }
@@ -1038,7 +1085,7 @@ static char *rna_def_property_begin_func(FILE *f, StructRNA *srna, PropertyRNA *
 
        fprintf(f, "\n  memset(iter, 0, sizeof(*iter));\n");
        fprintf(f, "    iter->parent= *ptr;\n");
-       fprintf(f, "    iter->prop= (PropertyRNA*)&rna_%s_%s;\n", srna->identifier, prop->identifier);
+       fprintf(f, "    iter->prop= (PropertyRNA *)&rna_%s_%s;\n", srna->identifier, prop->identifier);
 
        if (dp->dnalengthname || dp->dnalengthfixed) {
                if (manualfunc) {
@@ -1077,7 +1124,7 @@ static char *rna_def_property_lookup_int_func(FILE *f, StructRNA *srna, Property
                                               const char *manualfunc, const char *nextfunc)
 {
        /* note on indices, this is for external functions and ignores skipped values.
-        * so the the index can only be checked against the length when there is no 'skip' funcion. */
+        * so the the index can only be checked against the length when there is no 'skip' function. */
        char *func;
 
        if (prop->flag & PROP_IDPROPERTY && manualfunc == NULL)
@@ -1088,8 +1135,8 @@ static char *rna_def_property_lookup_int_func(FILE *f, StructRNA *srna, Property
                        return NULL;
 
                /* only supported in case of standard next functions */
-               if (strcmp(nextfunc, "rna_iterator_array_next") == 0);
-               else if (strcmp(nextfunc, "rna_iterator_listbase_next") == 0);
+               if (strcmp(nextfunc, "rna_iterator_array_next") == 0) {}
+               else if (strcmp(nextfunc, "rna_iterator_listbase_next") == 0) {}
                else return NULL;
        }
 
@@ -1153,7 +1200,7 @@ static char *rna_def_property_lookup_int_func(FILE *f, StructRNA *srna, Property
 
 #if 0
        rna_print_data_get(f, dp);
-       item_type = (cprop->item_type)? (const char*)cprop->item_type: "UnknownType";
+       item_type = (cprop->item_type) ? (const char *)cprop->item_type : "UnknownType";
 
        if (dp->dnalengthname || dp->dnalengthfixed) {
                if (dp->dnalengthname)
@@ -1177,7 +1224,90 @@ static char *rna_def_property_lookup_int_func(FILE *f, StructRNA *srna, Property
        return func;
 }
 
-static char *rna_def_property_next_func(FILE *f, StructRNA *srna, PropertyRNA *prop, PropertyDefRNA *dp,
+static char *rna_def_property_lookup_string_func(FILE *f, StructRNA *srna, PropertyRNA *prop, PropertyDefRNA *dp,
+                                                 const char *manualfunc, const char *item_type)
+{
+       char *func;
+       StructRNA *item_srna, *item_name_base;
+       PropertyRNA *item_name_prop;
+       const int namebuflen = 1024;
+
+       if (prop->flag & PROP_IDPROPERTY && manualfunc == NULL)
+               return NULL;
+
+       if (!manualfunc) {
+               if (!dp->dnastructname || !dp->dnaname)
+                       return NULL;
+
+               /* only supported for collection items with name properties */
+               item_srna = rna_find_struct(item_type);
+               if (item_srna && item_srna->nameproperty) {
+                       item_name_prop = item_srna->nameproperty;
+                       item_name_base = item_srna;
+                       while (item_name_base->base && item_name_base->base->nameproperty == item_name_prop)
+                               item_name_base = item_name_base->base;
+               }
+               else
+                       return NULL;
+       }
+
+       func = rna_alloc_function_name(srna->identifier, rna_safe_id(prop->identifier), "lookup_string");
+
+       fprintf(f, "int %s(PointerRNA *ptr, const char *key, PointerRNA *r_ptr)\n", func);
+       fprintf(f, "{\n");
+
+       if (manualfunc) {
+               fprintf(f, "    return %s(ptr, key, r_ptr);\n", manualfunc);
+               fprintf(f, "}\n\n");
+               return func;
+       }
+
+       /* XXX extern declaration could be avoid by including RNA_blender.h, but this has lots of unknown
+        * DNA types in functions, leading to conflicting function signatures.
+        */
+       fprintf(f, "    extern int %s_%s_length(PointerRNA *);\n", item_name_base->identifier, rna_safe_id(item_name_prop->identifier));
+       fprintf(f, "    extern void %s_%s_get(PointerRNA *, char *);\n\n", item_name_base->identifier, rna_safe_id(item_name_prop->identifier));
+
+       fprintf(f, "    int found= 0;\n");
+       fprintf(f, "    CollectionPropertyIterator iter;\n");
+       fprintf(f, "    char namebuf[%d];\n", namebuflen);
+       fprintf(f, "    char *name;\n\n");
+
+       fprintf(f, "    %s_%s_begin(&iter, ptr);\n\n", srna->identifier, rna_safe_id(prop->identifier));
+
+       fprintf(f, "    while (iter.valid) {\n");
+       fprintf(f, "            int namelen = %s_%s_length(&iter.ptr);\n", item_name_base->identifier, rna_safe_id(item_name_prop->identifier));
+       fprintf(f, "            if (namelen < %d) {\n", namebuflen);
+       fprintf(f, "                    %s_%s_get(&iter.ptr, namebuf);\n", item_name_base->identifier, rna_safe_id(item_name_prop->identifier));
+       fprintf(f, "                    if (strcmp(namebuf, key) == 0) {\n");
+       fprintf(f, "                            found = 1;\n");
+       fprintf(f, "                            *r_ptr = iter.ptr;\n");
+       fprintf(f, "                            break;\n");
+       fprintf(f, "                    }\n");
+       fprintf(f, "            }\n");
+       fprintf(f, "            else {\n");
+       fprintf(f, "                    name = MEM_mallocN(namelen+1, \"name string\");\n");
+       fprintf(f, "                    %s_%s_get(&iter.ptr, name);\n", item_name_base->identifier, rna_safe_id(item_name_prop->identifier));
+       fprintf(f, "                    if (strcmp(name, key) == 0) {\n");
+       fprintf(f, "                            MEM_freeN(name);\n\n");
+       fprintf(f, "                            found = 1;\n");
+       fprintf(f, "                            *r_ptr = iter.ptr;\n");
+       fprintf(f, "                            break;\n");
+       fprintf(f, "                    }\n");
+       fprintf(f, "                    else\n");
+       fprintf(f, "                            MEM_freeN(name);\n");
+       fprintf(f, "            }\n");
+       fprintf(f, "            %s_%s_next(&iter);\n", srna->identifier, rna_safe_id(prop->identifier));
+       fprintf(f, "    }\n");
+       fprintf(f, "    %s_%s_end(&iter);\n\n", srna->identifier, rna_safe_id(prop->identifier));
+
+       fprintf(f, "    return found;\n");
+       fprintf(f, "}\n\n");
+
+       return func;
+}
+
+static char *rna_def_property_next_func(FILE *f, StructRNA *srna, PropertyRNA *prop, PropertyDefRNA *UNUSED(dp),
                                         const char *manualfunc)
 {
        char *func, *getfunc;
@@ -1204,7 +1334,7 @@ static char *rna_def_property_next_func(FILE *f, StructRNA *srna, PropertyRNA *p
        return func;
 }
 
-static char *rna_def_property_end_func(FILE *f, StructRNA *srna, PropertyRNA *prop, PropertyDefRNA *dp,
+static char *rna_def_property_end_func(FILE *f, StructRNA *srna, PropertyRNA *prop, PropertyDefRNA *UNUSED(dp),
                                        const char *manualfunc)
 {
        char *func;
@@ -1266,80 +1396,86 @@ static void rna_def_property_funcs(FILE *f, StructRNA *srna, PropertyDefRNA *dp)
        prop = dp->prop;
 
        switch (prop->type) {
-               case PROP_BOOLEAN: {
-                       BoolPropertyRNA *bprop = (BoolPropertyRNA*)prop;
+               case PROP_BOOLEAN:
+               {
+                       BoolPropertyRNA *bprop = (BoolPropertyRNA *)prop;
 
                        if (!prop->arraydimension) {
                                if (!bprop->get && !bprop->set && !dp->booleanbit)
                                        rna_set_raw_property(dp, prop);
 
-                               bprop->get = (void*)rna_def_property_get_func(f, srna, prop, dp, (const char*)bprop->get);
-                               bprop->set = (void*)rna_def_property_set_func(f, srna, prop, dp, (const char*)bprop->set);
+                               bprop->get = (void *)rna_def_property_get_func(f, srna, prop, dp, (const char *)bprop->get);
+                               bprop->set = (void *)rna_def_property_set_func(f, srna, prop, dp, (const char *)bprop->set);
                        }
                        else {
-                               bprop->getarray = (void*)rna_def_property_get_func(f, srna, prop, dp, (const char*)bprop->getarray);
-                               bprop->setarray = (void*)rna_def_property_set_func(f, srna, prop, dp, (const char*)bprop->setarray);
+                               bprop->getarray = (void *)rna_def_property_get_func(f, srna, prop, dp, (const char *)bprop->getarray);
+                               bprop->setarray = (void *)rna_def_property_set_func(f, srna, prop, dp, (const char *)bprop->setarray);
                        }
                        break;
                }
-               case PROP_INT: {
-                       IntPropertyRNA *iprop = (IntPropertyRNA*)prop;
+               case PROP_INT:
+               {
+                       IntPropertyRNA *iprop = (IntPropertyRNA *)prop;
 
                        if (!prop->arraydimension) {
                                if (!iprop->get && !iprop->set)
                                        rna_set_raw_property(dp, prop);
 
-                               iprop->get = (void*)rna_def_property_get_func(f, srna, prop, dp, (const char*)iprop->get);
-                               iprop->set = (void*)rna_def_property_set_func(f, srna, prop, dp, (const char*)iprop->set);
+                               iprop->get = (void *)rna_def_property_get_func(f, srna, prop, dp, (const char *)iprop->get);
+                               iprop->set = (void *)rna_def_property_set_func(f, srna, prop, dp, (const char *)iprop->set);
                        }
                        else {
                                if (!iprop->getarray && !iprop->setarray)
                                        rna_set_raw_property(dp, prop);
 
-                               iprop->getarray = (void*)rna_def_property_get_func(f, srna, prop, dp, (const char*)iprop->getarray);
-                               iprop->setarray = (void*)rna_def_property_set_func(f, srna, prop, dp, (const char*)iprop->setarray);
+                               iprop->getarray = (void *)rna_def_property_get_func(f, srna, prop, dp, (const char *)iprop->getarray);
+                               iprop->setarray = (void *)rna_def_property_set_func(f, srna, prop, dp, (const char *)iprop->setarray);
                        }
                        break;
                }
-               case PROP_FLOAT: {
-                       FloatPropertyRNA *fprop = (FloatPropertyRNA*)prop;
+               case PROP_FLOAT:
+               {
+                       FloatPropertyRNA *fprop = (FloatPropertyRNA *)prop;
 
                        if (!prop->arraydimension) {
                                if (!fprop->get && !fprop->set)
                                        rna_set_raw_property(dp, prop);
 
-                               fprop->get = (void*)rna_def_property_get_func(f, srna, prop, dp, (const char*)fprop->get);
-                               fprop->set = (void*)rna_def_property_set_func(f, srna, prop, dp, (const char*)fprop->set);
+                               fprop->get = (void *)rna_def_property_get_func(f, srna, prop, dp, (const char *)fprop->get);
+                               fprop->set = (void *)rna_def_property_set_func(f, srna, prop, dp, (const char *)fprop->set);
                        }
                        else {
                                if (!fprop->getarray && !fprop->setarray)
                                        rna_set_raw_property(dp, prop);
 
-                               fprop->getarray = (void*)rna_def_property_get_func(f, srna, prop, dp, (const char*)fprop->getarray);
-                               fprop->setarray = (void*)rna_def_property_set_func(f, srna, prop, dp, (const char*)fprop->setarray);
+                               fprop->getarray = (void *)rna_def_property_get_func(f, srna, prop, dp, (const char *)fprop->getarray);
+                               fprop->setarray = (void *)rna_def_property_set_func(f, srna, prop, dp, (const char *)fprop->setarray);
                        }
                        break;
                }
-               case PROP_ENUM: {
-                       EnumPropertyRNA *eprop = (EnumPropertyRNA*)prop;
+               case PROP_ENUM:
+               {
+                       EnumPropertyRNA *eprop = (EnumPropertyRNA *)prop;
 
-                       eprop->get = (void*)rna_def_property_get_func(f, srna, prop, dp, (const char*)eprop->get);
-                       eprop->set = (void*)rna_def_property_set_func(f, srna, prop, dp, (const char*)eprop->set);
+                       eprop->get = (void *)rna_def_property_get_func(f, srna, prop, dp, (const char *)eprop->get);
+                       eprop->set = (void *)rna_def_property_set_func(f, srna, prop, dp, (const char *)eprop->set);
                        break;
                }
-               case PROP_STRING: {
-                       StringPropertyRNA *sprop = (StringPropertyRNA*)prop;
+               case PROP_STRING:
+               {
+                       StringPropertyRNA *sprop = (StringPropertyRNA *)prop;
 
-                       sprop->get = (void*)rna_def_property_get_func(f, srna, prop, dp, (const char*)sprop->get);
-                       sprop->length = (void*)rna_def_property_length_func(f, srna, prop, dp, (const char*)sprop->length);
-                       sprop->set = (void*)rna_def_property_set_func(f, srna, prop, dp, (const char*)sprop->set);
+                       sprop->get = (void *)rna_def_property_get_func(f, srna, prop, dp, (const char *)sprop->get);
+                       sprop->length = (void *)rna_def_property_length_func(f, srna, prop, dp, (const char *)sprop->length);
+                       sprop->set = (void *)rna_def_property_set_func(f, srna, prop, dp, (const char *)sprop->set);
                        break;
                }
-               case PROP_POINTER: {
-                       PointerPropertyRNA *pprop = (PointerPropertyRNA*)prop;
+               case PROP_POINTER:
+               {
+                       PointerPropertyRNA *pprop = (PointerPropertyRNA *)prop;
 
-                       pprop->get = (void*)rna_def_property_get_func(f, srna, prop, dp, (const char*)pprop->get);
-                       pprop->set = (void*)rna_def_property_set_func(f, srna, prop, dp, (const char*)pprop->set);
+                       pprop->get = (void *)rna_def_property_get_func(f, srna, prop, dp, (const char *)pprop->get);
+                       pprop->set = (void *)rna_def_property_set_func(f, srna, prop, dp, (const char *)pprop->set);
                        if (!pprop->type) {
                                fprintf(stderr, "%s: %s.%s, pointer must have a struct type.\n",
                                        __func__, srna->identifier, prop->identifier);
@@ -1347,29 +1483,36 @@ static void rna_def_property_funcs(FILE *f, StructRNA *srna, PropertyDefRNA *dp)
                        }
                        break;
                }
-               case PROP_COLLECTION: {
-                       CollectionPropertyRNA *cprop = (CollectionPropertyRNA*)prop;
-                       const char *nextfunc = (const char*)cprop->next;
+               case PROP_COLLECTION:
+               {
+                       CollectionPropertyRNA *cprop = (CollectionPropertyRNA *)prop;
+                       const char *nextfunc = (const char *)cprop->next;
+                       const char *item_type = (const char *)cprop->item_type;
 
-                       if (dp->dnatype && strcmp(dp->dnatype, "ListBase") == 0);
-                       else if (dp->dnalengthname || dp->dnalengthfixed)
-                               cprop->length = (void*)rna_def_property_length_func(f, srna, prop, dp, (const char*)cprop->length);
+                       if (dp->dnatype && strcmp(dp->dnatype, "ListBase") == 0) {
+                               /* pass */
+                       }
+                       else if (dp->dnalengthname || dp->dnalengthfixed) {
+                               cprop->length = (void *)rna_def_property_length_func(f, srna, prop, dp, (const char *)cprop->length);
+                       }
 
                        /* test if we can allow raw array access, if it is using our standard
                         * array get/next function, we can be sure it is an actual array */
                        if (cprop->next && cprop->get)
-                               if (strcmp((const char*)cprop->next, "rna_iterator_array_next") == 0 &&
-                                   strcmp((const char*)cprop->get, "rna_iterator_array_get") == 0)
+                               if (strcmp((const char *)cprop->next, "rna_iterator_array_next") == 0 &&
+                                   strcmp((const char *)cprop->get, "rna_iterator_array_get") == 0)
                                {
                                        prop->flag |= PROP_RAW_ARRAY;
                                }
 
-                       cprop->get = (void*)rna_def_property_get_func(f, srna, prop, dp, (const char*)cprop->get);
-                       cprop->begin = (void*)rna_def_property_begin_func(f, srna, prop, dp, (const char*)cprop->begin);
-                       cprop->next = (void*)rna_def_property_next_func(f, srna, prop, dp, (const char*)cprop->next);
-                       cprop->end = (void*)rna_def_property_end_func(f, srna, prop, dp, (const char*)cprop->end);
-                       cprop->lookupint = (void*)rna_def_property_lookup_int_func(f, srna, prop, dp,
-                                                                                  (const char*)cprop->lookupint, nextfunc);
+                       cprop->get = (void *)rna_def_property_get_func(f, srna, prop, dp, (const char *)cprop->get);
+                       cprop->begin = (void *)rna_def_property_begin_func(f, srna, prop, dp, (const char *)cprop->begin);
+                       cprop->next = (void *)rna_def_property_next_func(f, srna, prop, dp, (const char *)cprop->next);
+                       cprop->end = (void *)rna_def_property_end_func(f, srna, prop, dp, (const char *)cprop->end);
+                       cprop->lookupint = (void *)rna_def_property_lookup_int_func(f, srna, prop, dp,
+                                                                                   (const char *)cprop->lookupint, nextfunc);
+                       cprop->lookupstring = (void *)rna_def_property_lookup_string_func(f, srna, prop, dp,
+                                                                                         (const char *)cprop->lookupstring, item_type);
 
                        if (!(prop->flag & PROP_IDPROPERTY)) {
                                if (!cprop->begin) {
@@ -1405,51 +1548,54 @@ static void rna_def_property_funcs_header(FILE *f, StructRNA *srna, PropertyDefR
 
        prop = dp->prop;
 
-       if (prop->flag & (PROP_IDPROPERTY|PROP_BUILTIN))
+       if (prop->flag & (PROP_IDPROPERTY | PROP_BUILTIN))
                return;
 
        func = rna_alloc_function_name(srna->identifier, rna_safe_id(prop->identifier), "");
 
        switch (prop->type) {
                case PROP_BOOLEAN:
-               case PROP_INT: {
+               case PROP_INT:
+               {
                        if (!prop->arraydimension) {
                                fprintf(f, "int %sget(PointerRNA *ptr);\n", func);
-                               /*fprintf(f, "void %sset(PointerRNA *ptr, int value);\n", func); */
+                               fprintf(f, "void %sset(PointerRNA *ptr, int value);\n", func);
                        }
                        else if (prop->arraydimension && prop->totarraylength) {
                                fprintf(f, "void %sget(PointerRNA *ptr, int values[%u]);\n", func, prop->totarraylength);
-                               /*fprintf(f, "void %sset(PointerRNA *ptr, const int values[%d]);\n", func, prop->arraylength); */
+                               fprintf(f, "void %sset(PointerRNA *ptr, const int values[%d]);\n", func, prop->totarraylength);
                        }
                        else {
                                fprintf(f, "void %sget(PointerRNA *ptr, int values[]);\n", func);
-                               /*fprintf(f, "void %sset(PointerRNA *ptr, const int values[]);\n", func); */
+                               fprintf(f, "void %sset(PointerRNA *ptr, const int values[]);\n", func);
                        }
                        break;
                }
-               case PROP_FLOAT: {
+               case PROP_FLOAT:
+               {
                        if (!prop->arraydimension) {
                                fprintf(f, "float %sget(PointerRNA *ptr);\n", func);
-                               /*fprintf(f, "void %sset(PointerRNA *ptr, float value);\n", func); */
+                               fprintf(f, "void %sset(PointerRNA *ptr, float value);\n", func);
                        }
                        else if (prop->arraydimension && prop->totarraylength) {
                                fprintf(f, "void %sget(PointerRNA *ptr, float values[%u]);\n", func, prop->totarraylength);
-                               /*fprintf(f, "void %sset(PointerRNA *ptr, const float values[%d]);\n", func, prop->arraylength); */
+                               fprintf(f, "void %sset(PointerRNA *ptr, const float values[%d]);\n", func, prop->totarraylength);
                        }
                        else {
                                fprintf(f, "void %sget(PointerRNA *ptr, float values[]);\n", func);
-                               /*fprintf(f, "void %sset(PointerRNA *ptr, const float values[]);\n", func); */
+                               fprintf(f, "void %sset(PointerRNA *ptr, const float values[]);", func);
                        }
                        break;
                }
-               case PROP_ENUM: {
-                       EnumPropertyRNA *eprop = (EnumPropertyRNA*)prop;
+               case PROP_ENUM:
+               {
+                       EnumPropertyRNA *eprop = (EnumPropertyRNA *)prop;
                        int i;
 
                        if (eprop->item) {
                                fprintf(f, "enum {\n");
 
-                               for (i = 0; i<eprop->totitem; i++)
+                               for (i = 0; i < eprop->totitem; i++)
                                        if (eprop->item[i].identifier[0])
                                                fprintf(f, "\t%s_%s_%s = %d,\n", srna->identifier, prop->identifier,
                                                        eprop->item[i].identifier, eprop->item[i].value);
@@ -1458,12 +1604,13 @@ static void rna_def_property_funcs_header(FILE *f, StructRNA *srna, PropertyDefR
                        }
 
                        fprintf(f, "int %sget(PointerRNA *ptr);\n", func);
-                       /*fprintf(f, "void %sset(PointerRNA *ptr, int value);\n", func); */
+                       fprintf(f, "void %sset(PointerRNA *ptr, int value);\n", func);
 
                        break;
                }
-               case PROP_STRING: {
-                       StringPropertyRNA *sprop = (StringPropertyRNA*)prop;
+               case PROP_STRING:
+               {
+                       StringPropertyRNA *sprop = (StringPropertyRNA *)prop;
 
                        if (sprop->maxlength) {
                                fprintf(f, "#define %s_%s_MAX %d\n\n", srna->identifier, prop->identifier, sprop->maxlength);
@@ -1471,36 +1618,57 @@ static void rna_def_property_funcs_header(FILE *f, StructRNA *srna, PropertyDefR
                        
                        fprintf(f, "void %sget(PointerRNA *ptr, char *value);\n", func);
                        fprintf(f, "int %slength(PointerRNA *ptr);\n", func);
-                       /*fprintf(f, "void %sset(PointerRNA *ptr, const char *value);\n", func); */
+                       fprintf(f, "void %sset(PointerRNA *ptr, const char *value);\n", func);
 
                        break;
                }
-               case PROP_POINTER: {
+               case PROP_POINTER:
+               {
                        fprintf(f, "PointerRNA %sget(PointerRNA *ptr);\n", func);
                        /*fprintf(f, "void %sset(PointerRNA *ptr, PointerRNA value);\n", func); */
                        break;
                }
-               case PROP_COLLECTION: {
+               case PROP_COLLECTION:
+               {
+                       CollectionPropertyRNA *cprop = (CollectionPropertyRNA *)prop;
                        fprintf(f, "void %sbegin(CollectionPropertyIterator *iter, PointerRNA *ptr);\n", func);
                        fprintf(f, "void %snext(CollectionPropertyIterator *iter);\n", func);
                        fprintf(f, "void %send(CollectionPropertyIterator *iter);\n", func);
-                       /*fprintf(f, "int %slength(PointerRNA *ptr);\n", func); */
-                       /*fprintf(f, "void %slookup_int(PointerRNA *ptr, int key, StructRNA **type);\n", func); */
-                       /*fprintf(f, "void %slookup_string(PointerRNA *ptr, const char *key, StructRNA **type);\n", func); */
+                       if (cprop->length)
+                               fprintf(f, "int %slength(PointerRNA *ptr);\n", func);
+                       if (cprop->lookupint)
+                               fprintf(f, "int %slookup_int(PointerRNA *ptr, int key, PointerRNA *r_ptr);\n", func);
+                       if (cprop->lookupstring)
+                               fprintf(f, "int %slookup_string(PointerRNA *ptr, const char *key, PointerRNA *r_ptr);\n", func);
                        break;
                }
        }
 
+       if (prop->getlength) {
+               char funcname[2048];
+               rna_construct_wrapper_function_name(funcname, sizeof(funcname), srna->identifier, prop->identifier, "get_length");
+               fprintf(f, "int %s(PointerRNA *ptr, int *arraylen);\n", funcname);
+       }
+
        fprintf(f, "\n");
 }
 
+static void rna_def_function_funcs_header(FILE *f, StructRNA *srna, FunctionDefRNA *dfunc)
+{
+       FunctionRNA *func = dfunc->func;
+       char funcname[2048];
+
+       rna_construct_wrapper_function_name(funcname, sizeof(funcname), srna->identifier, func->identifier, NULL);
+       rna_generate_static_parameter_prototypes(f, srna, dfunc, funcname, 1);
+}
+
 static void rna_def_property_funcs_header_cpp(FILE *f, StructRNA *srna, PropertyDefRNA *dp)
 {
        PropertyRNA *prop;
 
        prop = dp->prop;
 
-       if (prop->flag & (PROP_IDPROPERTY|PROP_BUILTIN))
+       if (prop->flag & (PROP_IDPROPERTY | PROP_BUILTIN))
                return;
        
        if (prop->name && prop->description && prop->description[0] != '\0')
@@ -1511,35 +1679,63 @@ static void rna_def_property_funcs_header_cpp(FILE *f, StructRNA *srna, Property
                fprintf(f, "\t/* */\n");
 
        switch (prop->type) {
-               case PROP_BOOLEAN: {
-                       if (!prop->arraydimension)
-                               fprintf(f, "\tinline bool %s(void);", rna_safe_id(prop->identifier));
-                       else if (prop->totarraylength)
-                               fprintf(f, "\tinline Array<int, %u> %s(void);", prop->totarraylength, rna_safe_id(prop->identifier));
+               case PROP_BOOLEAN:
+               {
+                       if (!prop->arraydimension) {
+                               fprintf(f, "\tinline bool %s(void);\n", rna_safe_id(prop->identifier));
+                               fprintf(f, "\tinline void %s(int value);", rna_safe_id(prop->identifier));
+                       }
+                       else if (prop->totarraylength) {
+                               fprintf(f, "\tinline Array<int, %u> %s(void);\n", prop->totarraylength, rna_safe_id(prop->identifier));
+                               fprintf(f, "\tinline void %s(int values[%u]);", rna_safe_id(prop->identifier), prop->totarraylength);
+                       }
+                       else if (prop->getlength) {
+                               fprintf(f, "\tinline DynamicArray<int> %s(void);\n", rna_safe_id(prop->identifier));
+                               fprintf(f, "\tinline void %s(int values[]);", rna_safe_id(prop->identifier));
+                       }
                        break;
                }
-               case PROP_INT: {
-                       if (!prop->arraydimension)
-                               fprintf(f, "\tinline int %s(void);", rna_safe_id(prop->identifier));
-                       else if (prop->totarraylength)
-                               fprintf(f, "\tinline Array<int, %u> %s(void);", prop->totarraylength, rna_safe_id(prop->identifier));
+               case PROP_INT:
+               {
+                       if (!prop->arraydimension) {
+                               fprintf(f, "\tinline int %s(void);\n", rna_safe_id(prop->identifier));
+                               fprintf(f, "\tinline void %s(int value);", rna_safe_id(prop->identifier));
+                       }
+                       else if (prop->totarraylength) {
+                               fprintf(f, "\tinline Array<int, %u> %s(void);\n", prop->totarraylength, rna_safe_id(prop->identifier));
+                               fprintf(f, "\tinline void %s(int values[%u]);", rna_safe_id(prop->identifier), prop->totarraylength);
+                       }
+                       else if (prop->getlength) {
+                               fprintf(f, "\tinline DynamicArray<int> %s(void);\n", rna_safe_id(prop->identifier));
+                               fprintf(f, "\tinline void %s(int values[]);", rna_safe_id(prop->identifier));
+                       }
                        break;
                }
-               case PROP_FLOAT: {
-                       if (!prop->arraydimension)
-                               fprintf(f, "\tinline float %s(void);", rna_safe_id(prop->identifier));
-                       else if (prop->totarraylength)
-                               fprintf(f, "\tinline Array<float, %u> %s(void);", prop->totarraylength, rna_safe_id(prop->identifier));
+               case PROP_FLOAT:
+               {
+                       if (!prop->arraydimension) {
+                               fprintf(f, "\tinline float %s(void);\n", rna_safe_id(prop->identifier));
+                               fprintf(f, "\tinline void %s(float value);", rna_safe_id(prop->identifier));
+                       }
+                       else if (prop->totarraylength) {
+                               fprintf(f, "\tinline Array<float, %u> %s(void);\n", prop->totarraylength, rna_safe_id(prop->identifier));
+                               fprintf(f, "\tinline void %s(float values[%u]);", rna_safe_id(prop->identifier), prop->totarraylength);
+                       }
+                       else if (prop->getlength) {
+                               fprintf(f, "\tinline DynamicArray<float> %s(void);\n", rna_safe_id(prop->identifier));
+                               fprintf(f, "\tinline void %s(float values[]);", rna_safe_id(prop->identifier));
+                       }
                        break;
                }
-               case PROP_ENUM: {
-                       EnumPropertyRNA *eprop = (EnumPropertyRNA*)prop;
+               case PROP_ENUM:
+               {
+                       EnumPropertyRNA *eprop = (EnumPropertyRNA *)prop;
                        int i;
 
                        if (eprop->item) {
                                fprintf(f, "\tenum %s_enum {\n", rna_safe_id(prop->identifier));
 
-                               for (i = 0; i<eprop->totitem; i++)
+                               for (i = 0; i < eprop->totitem; i++)
                                        if (eprop->item[i].identifier[0])
                                                fprintf(f, "\t\t%s_%s = %d,\n", rna_safe_id(prop->identifier), eprop->item[i].identifier,
                                                        eprop->item[i].value);
@@ -1547,31 +1743,42 @@ static void rna_def_property_funcs_header_cpp(FILE *f, StructRNA *srna, Property
                                fprintf(f, "\t};\n");
                        }
 
-                       fprintf(f, "\tinline %s_enum %s(void);", rna_safe_id(prop->identifier), rna_safe_id(prop->identifier));
+                       fprintf(f, "\tinline %s_enum %s(void);\n", rna_safe_id(prop->identifier), rna_safe_id(prop->identifier));
+                       fprintf(f, "\tinline void %s(%s_enum value);", rna_safe_id(prop->identifier), rna_safe_id(prop->identifier));
                        break;
                }
-               case PROP_STRING: {
+               case PROP_STRING:
+               {
                        fprintf(f, "\tinline std::string %s(void);", rna_safe_id(prop->identifier));
+                       fprintf(f, "\tinline void %s(const std::string& value);", rna_safe_id(prop->identifier));
                        break;
                }
-               case PROP_POINTER: {
-                       PointerPropertyRNA *pprop = (PointerPropertyRNA*)dp->prop;
+               case PROP_POINTER:
+               {
+                       PointerPropertyRNA *pprop = (PointerPropertyRNA *)dp->prop;
 
                        if (pprop->type)
-                               fprintf(f, "\tinline %s %s(void);", (const char*)pprop->type, rna_safe_id(prop->identifier));
+                               fprintf(f, "\tinline %s %s(void);", (const char *)pprop->type, rna_safe_id(prop->identifier));
                        else
                                fprintf(f, "\tinline %s %s(void);", "UnknownType", rna_safe_id(prop->identifier));
                        break;
                }
-               case PROP_COLLECTION: {
-                       CollectionPropertyRNA *cprop = (CollectionPropertyRNA*)dp->prop;
+               case PROP_COLLECTION:
+               {
+                       CollectionPropertyRNA *cprop = (CollectionPropertyRNA *)dp->prop;
+                       const char *collection_funcs = "DefaultCollectionFunctions";
+
+                       if (!(dp->prop->flag & (PROP_IDPROPERTY | PROP_BUILTIN)) && cprop->property.srna)
+                               collection_funcs  = (char *)cprop->property.srna;
 
                        if (cprop->item_type)
-                               fprintf(f, "\tCOLLECTION_PROPERTY(%s, %s, %s)", (const char*)cprop->item_type, srna->identifier,
-                                       rna_safe_id(prop->identifier));
+                               fprintf(f, "\tCOLLECTION_PROPERTY(%s, %s, %s, %s, %s, %s, %s)", collection_funcs, (const char *)cprop->item_type, srna->identifier,
+                                       rna_safe_id(prop->identifier), (cprop->length ? "TRUE" : "FALSE"),
+                                       (cprop->lookupint ? "TRUE" : "FALSE"), (cprop->lookupstring ? "TRUE" : "FALSE"));
                        else
-                               fprintf(f, "\tCOLLECTION_PROPERTY(%s, %s, %s)", "UnknownType", srna->identifier,
-                                       rna_safe_id(prop->identifier));
+                               fprintf(f, "\tCOLLECTION_PROPERTY(%s, %s, %s, %s, %s, %s, %s)", collection_funcs, "UnknownType", srna->identifier,
+                                       rna_safe_id(prop->identifier), (cprop->length ? "TRUE" : "FALSE"),
+                                       (cprop->lookupint ? "TRUE" : "FALSE"), (cprop->lookupstring ? "TRUE" : "FALSE"));
                        break;
                }
        }
@@ -1579,70 +1786,179 @@ static void rna_def_property_funcs_header_cpp(FILE *f, StructRNA *srna, Property
        fprintf(f, "\n");
 }
 
+static const char *rna_parameter_type_cpp_name(PropertyRNA *prop)
+{
+       if (prop->type == PROP_POINTER) {
+               /* for cpp api we need to use RNA structures names for pointers */
+               PointerPropertyRNA *pprop = (PointerPropertyRNA *) prop;
+
+               return (const char *) pprop->type;
+       }
+       else {
+               return rna_parameter_type_name(prop);
+       }
+}
+
+static void rna_def_struct_function_prototype_cpp(FILE *f, StructRNA *UNUSED(srna), FunctionDefRNA *dfunc,
+                                                  const char *namespace, int close_prototype)
+{
+       PropertyDefRNA *dp;
+       FunctionRNA *func = dfunc->func;
+
+       int first = 1;
+       const char *retval_type = "void";
+
+       if (func->c_ret) {
+               dp = rna_find_parameter_def(func->c_ret);
+               retval_type = rna_parameter_type_cpp_name(dp->prop);
+       }
+
+       if (namespace && namespace[0])
+               fprintf(f, "\tinline %s %s::%s(", retval_type, namespace, rna_safe_id(func->identifier));
+       else
+               fprintf(f, "\tinline %s %s(", retval_type, rna_safe_id(func->identifier));
+
+       if (func->flag & FUNC_USE_MAIN)
+               WRITE_PARAM("void *main");
+
+       if (func->flag & FUNC_USE_CONTEXT)
+               WRITE_PARAM("Context C");
+
+       for (dp = dfunc->cont.properties.first; dp; dp = dp->next) {
+               int type, flag, pout;
+               const char *ptrstr;
+
+               if (dp->prop == func->c_ret)
+                       continue;
+
+               type = dp->prop->type;
+               flag = dp->prop->flag;
+               pout = (flag & PROP_OUTPUT);
+
+               if (type == PROP_POINTER)
+                       ptrstr = "";
+               else if ((type == PROP_POINTER) && (flag & PROP_RNAPTR) && !(flag & PROP_THICK_WRAP))
+                       ptrstr = "*";
+               else if (type == PROP_POINTER || dp->prop->arraydimension)
+                       ptrstr = "*";
+               else if (type == PROP_STRING && (flag & PROP_THICK_WRAP))
+                       ptrstr = "";
+               else
+                       ptrstr = pout ? "*" : "";
+
+               WRITE_COMMA;
+
+               if (flag & PROP_DYNAMIC)
+                       fprintf(f, "int %s%s_len, ", (flag & PROP_OUTPUT) ? "*" : "", dp->prop->identifier);
+
+               if (!(flag & PROP_DYNAMIC) && dp->prop->arraydimension)
+                       fprintf(f, "%s %s[%u]", rna_parameter_type_cpp_name(dp->prop),
+                               rna_safe_id(dp->prop->identifier), dp->prop->totarraylength);
+               else
+                       fprintf(f, "%s %s%s", rna_parameter_type_cpp_name(dp->prop),
+                               ptrstr, rna_safe_id(dp->prop->identifier));
+       }
+
+       fprintf(f, ")");
+       if (close_prototype)
+               fprintf(f, ";\n");
+}
+
+static void rna_def_struct_function_header_cpp(FILE *f, StructRNA *srna, FunctionDefRNA *dfunc)
+{
+       FunctionRNA *func = dfunc->func;
+
+       if (!dfunc->call)
+               return;
+
+       fprintf(f, "\n\t/* %s */\n", func->description);
+
+       rna_def_struct_function_prototype_cpp(f, srna, dfunc, NULL, 1);
+}
+
 static void rna_def_property_funcs_impl_cpp(FILE *f, StructRNA *srna, PropertyDefRNA *dp)
 {
        PropertyRNA *prop;
 
        prop = dp->prop;
 
-       if (prop->flag & (PROP_IDPROPERTY|PROP_BUILTIN))
+       if (prop->flag & (PROP_IDPROPERTY | PROP_BUILTIN))
                return;
 
        switch (prop->type) {
-               case PROP_BOOLEAN: {
+               case PROP_BOOLEAN:
+               {
                        if (!prop->arraydimension)
                                fprintf(f, "\tBOOLEAN_PROPERTY(%s, %s)", srna->identifier, rna_safe_id(prop->identifier));
                        else if (prop->totarraylength)
                                fprintf(f, "\tBOOLEAN_ARRAY_PROPERTY(%s, %u, %s)", srna->identifier, prop->totarraylength,
                                        rna_safe_id(prop->identifier));
+                       else if (prop->getlength)
+                               fprintf(f, "\tBOOLEAN_DYNAMIC_ARRAY_PROPERTY(%s, %s)", srna->identifier,
+                                       rna_safe_id(prop->identifier));
                        break;
                }
-               case PROP_INT: {
+               case PROP_INT:
+               {
                        if (!prop->arraydimension)
                                fprintf(f, "\tINT_PROPERTY(%s, %s)", srna->identifier, rna_safe_id(prop->identifier));
                        else if (prop->totarraylength)
                                fprintf(f, "\tINT_ARRAY_PROPERTY(%s, %u, %s)", srna->identifier, prop->totarraylength,
                                        rna_safe_id(prop->identifier));
+                       else if (prop->getlength)
+                               fprintf(f, "\tINT_DYNAMIC_ARRAY_PROPERTY(%s, %s)", srna->identifier,
+                                       rna_safe_id(prop->identifier));
                        break;
                }
-               case PROP_FLOAT: {
+               case PROP_FLOAT:
+               {
                        if (!prop->arraydimension)
                                fprintf(f, "\tFLOAT_PROPERTY(%s, %s)", srna->identifier, rna_safe_id(prop->identifier));
                        else if (prop->totarraylength)
                                fprintf(f, "\tFLOAT_ARRAY_PROPERTY(%s, %u, %s)", srna->identifier, prop->totarraylength,
                                        rna_safe_id(prop->identifier));
+                       else if (prop->getlength)
+                               fprintf(f, "\tFLOAT_DYNAMIC_ARRAY_PROPERTY(%s, %s)", srna->identifier,
+                                       rna_safe_id(prop->identifier));
                        break;
                }
-               case PROP_ENUM: {
+               case PROP_ENUM:
+               {
                        fprintf(f, "\tENUM_PROPERTY(%s_enum, %s, %s)", rna_safe_id(prop->identifier), srna->identifier,
                                rna_safe_id(prop->identifier));
 
                        break;
                }
-               case PROP_STRING: {
+               case PROP_STRING:
+               {
                        fprintf(f, "\tSTRING_PROPERTY(%s, %s)", srna->identifier, rna_safe_id(prop->identifier));
                        break;
                }
-               case PROP_POINTER: {
-                       PointerPropertyRNA *pprop = (PointerPropertyRNA*)dp->prop;
+               case PROP_POINTER:
+               {
+                       PointerPropertyRNA *pprop = (PointerPropertyRNA *)dp->prop;
 
                        if (pprop->type)
-                               fprintf(f, "\tPOINTER_PROPERTY(%s, %s, %s)", (const char*)pprop->type, srna->identifier,
+                               fprintf(f, "\tPOINTER_PROPERTY(%s, %s, %s)", (const char *)pprop->type, srna->identifier,
                                        rna_safe_id(prop->identifier));
                        else
                                fprintf(f, "\tPOINTER_PROPERTY(%s, %s, %s)", "UnknownType", srna->identifier,
                                        rna_safe_id(prop->identifier));
                        break;
                }
-               case PROP_COLLECTION: {
+               case PROP_COLLECTION:
+               {
 #if 0
-                       CollectionPropertyRNA *cprop = (CollectionPropertyRNA*)dp->prop;
+                       CollectionPropertyRNA *cprop = (CollectionPropertyRNA *)dp->prop;
 
                        if (cprop->type)
-                               fprintf(f, "\tCOLLECTION_PROPERTY(%s, %s, %s)", (const char*)cprop->type, srna->identifier,
-                                       prop->identifier);
+                               fprintf(f, "\tCOLLECTION_PROPERTY(%s, %s, %s, %s, %s, %s)", (const char *)cprop->type, srna->identifier,
+                                       prop->identifier, (cprop->length ? "TRUE" : "FALSE"),
+                                       (cprop->lookupint ? "TRUE" : "FALSE"), (cprop->lookupstring ? "TRUE" : "FALSE"));
                        else
-                               fprintf(f, "\tCOLLECTION_PROPERTY(%s, %s, %s)", "UnknownType", srna->identifier, prop->identifier);
+                               fprintf(f, "\tCOLLECTION_PROPERTY(%s, %s, %s, %s, %s, %s)", "UnknownType", srna->identifier,
+                                       prop->identifier, (cprop->length ? "TRUE" : "FALSE"),
+                                       (cprop->lookupint ? "TRUE" : "FALSE"), (cprop->lookupstring ? "TRUE" : "FALSE"));
 #endif
                        break;
                }
@@ -1651,6 +1967,189 @@ static void rna_def_property_funcs_impl_cpp(FILE *f, StructRNA *srna, PropertyDe
        fprintf(f, "\n");
 }
 
+static void rna_def_struct_function_call_impl_cpp(FILE *f, StructRNA *srna, FunctionDefRNA *dfunc)
+{
+       PropertyDefRNA *dp;
+       StructDefRNA *dsrna;
+       FunctionRNA *func = dfunc->func;
+       char funcname[2048];
+
+       int first = 1;
+
+       rna_construct_wrapper_function_name(funcname, sizeof(funcname), srna->identifier, func->identifier, NULL);
+
+       fprintf(f, "%s(", funcname);
+
+       dsrna = rna_find_struct_def(srna);
+
+       if (func->flag & FUNC_USE_SELF_ID)
+               WRITE_PARAM("(::ID *) ptr.id.data");
+
+       if ((func->flag & FUNC_NO_SELF) == 0) {
+               WRITE_COMMA;
+               if (dsrna->dnaname) fprintf(f, "(::%s *) this->ptr.data", dsrna->dnaname);
+               else fprintf(f, "(::%s *) this->ptr.data", srna->identifier);
+       }
+       else if (func->flag & FUNC_USE_SELF_TYPE) {
+               WRITE_COMMA;
+               fprintf(f, "this->ptr.type");
+       }
+
+       if (func->flag & FUNC_USE_MAIN)
+               WRITE_PARAM("(::Main *) main");
+
+       if (func->flag & FUNC_USE_CONTEXT)
+               WRITE_PARAM("(::bContext *) C.ptr.data");
+
+       if (func->flag & FUNC_USE_REPORTS)
+               WRITE_PARAM("NULL");
+
+       dp = dfunc->cont.properties.first;
+       for (; dp; dp = dp->next) {
+               if (dp->prop == func->c_ret)
+                       continue;
+
+               WRITE_COMMA;
+
+               if (dp->prop->flag & PROP_DYNAMIC)
+                       fprintf(f, "%s_len, ", dp->prop->identifier);
+
+               if (dp->prop->type == PROP_POINTER)
+                       if ((dp->prop->flag & PROP_RNAPTR) && !(dp->prop->flag & PROP_THICK_WRAP))
+                               fprintf(f, "(::%s *) &%s.ptr", rna_parameter_type_name(dp->prop), rna_safe_id(dp->prop->identifier));
+                       else
+                               fprintf(f, "(::%s *) %s.ptr.data", rna_parameter_type_name(dp->prop), rna_safe_id(dp->prop->identifier));
+               else
+                       fprintf(f, "%s", rna_safe_id(dp->prop->identifier));
+       }
+
+       fprintf(f, ");\n");
+}
+
+static void rna_def_struct_function_impl_cpp(FILE *f, StructRNA *srna, FunctionDefRNA *dfunc)
+{
+       PropertyDefRNA *dp;
+       PointerPropertyRNA *pprop;
+
+       FunctionRNA *func = dfunc->func;
+
+       if (!dfunc->call)
+               return;
+
+       rna_def_struct_function_prototype_cpp(f, srna, dfunc, srna->identifier, 0);
+
+       fprintf(f, " {\n");
+
+       if (func->c_ret) {
+               dp = rna_find_parameter_def(func->c_ret);
+
+               if (dp->prop->type == PROP_POINTER) {
+                       pprop = (PointerPropertyRNA *) dp->prop;
+
+                       fprintf(f, "\t\tPointerRNA result;\n");
+
+                       if ((dp->prop->flag & PROP_RNAPTR) == 0) {
+                               StructRNA *ret_srna = rna_find_struct((const char *) pprop->type);
+                               fprintf(f, "\t\t::%s *retdata = ", rna_parameter_type_name(dp->prop));
+                               rna_def_struct_function_call_impl_cpp(f, srna, dfunc);
+                               if (ret_srna->flag & STRUCT_ID)
+                                       fprintf(f, "\t\tRNA_id_pointer_create((::ID *) retdata, &result);\n");
+                               else
+                                       fprintf(f, "\t\tRNA_pointer_create((::ID *) ptr.id.data, &RNA_%s, retdata, &result);\n", (const char *) pprop->type);
+                       }
+                       else {
+                               fprintf(f, "\t\tresult = ");
+                               rna_def_struct_function_call_impl_cpp(f, srna, dfunc);
+                       }
+
+                       fprintf(f, "\t\treturn %s(result);\n", (const char *) pprop->type);
+               }
+               else {
+                       fprintf(f, "\t\treturn ");
+                       rna_def_struct_function_call_impl_cpp(f, srna, dfunc);
+               }
+       }
+       else {
+               fprintf(f, "\t\t");
+               rna_def_struct_function_call_impl_cpp(f, srna, dfunc);
+       }
+
+       fprintf(f, "\t}\n\n");
+}
+
+static void rna_def_property_wrapper_funcs(FILE *f, StructDefRNA *dsrna, PropertyDefRNA *dp)
+{
+       if (dp->prop->getlength) {
+               char funcname[2048];
+               rna_construct_wrapper_function_name(funcname, sizeof(funcname), dsrna->srna->identifier, dp->prop->identifier, "get_length");
+               fprintf(f, "int %s(PointerRNA *ptr, int *arraylen)\n", funcname);
+               fprintf(f, "{\n");
+               fprintf(f, "\treturn %s(ptr, arraylen);\n", rna_function_string(dp->prop->getlength));
+               fprintf(f, "}\n\n");
+       }
+}
+
+static void rna_def_function_wrapper_funcs(FILE *f, StructDefRNA *dsrna, FunctionDefRNA *dfunc)
+{
+       StructRNA *srna = dsrna->srna;
+       FunctionRNA *func = dfunc->func;
+       PropertyDefRNA *dparm;
+
+       int first;
+       char funcname[2048];
+
+       if (!dfunc->call)
+               return;
+
+       rna_construct_wrapper_function_name(funcname, sizeof(funcname), srna->identifier, func->identifier, NULL);
+
+       rna_generate_static_parameter_prototypes(f, srna, dfunc, funcname, 0);
+
+       fprintf(f, "\n{\n");
+
+       if (func->c_ret)
+               fprintf(f, "\treturn %s(", dfunc->call);
+       else
+               fprintf(f, "\t%s(", dfunc->call);
+
+       first = 1;
+
+       if (func->flag & FUNC_USE_SELF_ID)
+               WRITE_PARAM("_selfid");
+
+       if ((func->flag & FUNC_NO_SELF) == 0) {
+               WRITE_PARAM("_self");
+       }
+       else if (func->flag & FUNC_USE_SELF_TYPE) {
+               WRITE_PARAM("_type");
+       }
+
+       if (func->flag & FUNC_USE_MAIN)
+               WRITE_PARAM("bmain");
+
+       if (func->flag & FUNC_USE_CONTEXT)
+               WRITE_PARAM("C");
+
+       if (func->flag & FUNC_USE_REPORTS)
+               WRITE_PARAM("reports");
+
+       dparm = dfunc->cont.properties.first;
+       for (; dparm; dparm = dparm->next) {
+               if (dparm->prop == func->c_ret)
+                       continue;
+
+               WRITE_COMMA;
+
+               if (dparm->prop->flag & PROP_DYNAMIC)
+                       fprintf(f, "%s_len, %s", dparm->prop->identifier, dparm->prop->identifier);
+               else
+                       fprintf(f, "%s", rna_safe_id(dparm->prop->identifier));
+       }
+
+       fprintf(f, ");\n");
+       fprintf(f, "}\n\n");
+}
+
 static void rna_def_function_funcs(FILE *f, StructDefRNA *dsrna, FunctionDefRNA *dfunc)
 {
        StructRNA *srna;
@@ -1684,6 +2183,9 @@ static void rna_def_function_funcs(FILE *f, StructDefRNA *dsrna, FunctionDefRNA
                if (dsrna->dnaname) fprintf(f, "\tstruct %s *_self;\n", dsrna->dnaname);
                else fprintf(f, "\tstruct %s *_self;\n", srna->identifier);
        }
+       else if (func->flag & FUNC_USE_SELF_TYPE) {
+               fprintf(f, "\tstruct StructRNA *_type;\n");
+       }
 
        dparm = dfunc->cont.properties.first;
        for (; dparm; dparm = dparm->next) {
@@ -1700,6 +2202,8 @@ static void rna_def_function_funcs(FILE *f, StructDefRNA *dsrna, FunctionDefRNA
                /* fixed size arrays and RNA pointers are pre-allocated on the ParameterList stack, pass a pointer to it */
                else if (type == PROP_POINTER || dparm->prop->arraydimension)
                        ptrstr = "*";
+               else if ((type == PROP_POINTER) && (flag & PROP_RNAPTR) && !(flag & PROP_THICK_WRAP))
+                       ptrstr = "*";
                /* PROP_THICK_WRAP strings are pre-allocated on the ParameterList stack,
                 * but type name for string props is already char*, so leave empty */
                else if (type == PROP_STRING && (flag & PROP_THICK_WRAP))
@@ -1731,6 +2235,9 @@ static void rna_def_function_funcs(FILE *f, StructDefRNA *dsrna, FunctionDefRNA
                if (dsrna->dnaname) fprintf(f, "\t_self= (struct %s *)_ptr->data;\n", dsrna->dnaname);
                else fprintf(f, "\t_self= (struct %s *)_ptr->data;\n", srna->identifier);
        }
+       else if (func->flag & FUNC_USE_SELF_TYPE) {
+               fprintf(f, "\t_type= _ptr->type;\n");
+       }
 
        if (has_data) {
                fprintf(f, "\t_data= (char *)_parms->data;\n");
@@ -1751,6 +2258,10 @@ static void rna_def_function_funcs(FILE *f, StructDefRNA *dsrna, FunctionDefRNA
                                ptrstr = "**";
                                valstr = "*";
                        }
+                       else if ((type == PROP_POINTER) && !(flag & PROP_THICK_WRAP)) {
+                               ptrstr = "**";
+                               valstr = "*";
+                       }
                        else if (type == PROP_POINTER || dparm->prop->arraydimension) {
                                ptrstr = "*";
                                valstr = "";
@@ -1773,7 +2284,7 @@ static void rna_def_function_funcs(FILE *f, StructDefRNA *dsrna, FunctionDefRNA
                        else {
                                data_str = "_data";
                        }
-                       fprintf(f, "\t%s= ", dparm->prop->identifier);
+                       fprintf(f, "\t%s = ", dparm->prop->identifier);
 
                        if (!pout)
                                fprintf(f, "%s", valstr);
@@ -1783,13 +2294,13 @@ static void rna_def_function_funcs(FILE *f, StructDefRNA *dsrna, FunctionDefRNA
                }
 
                if (dparm->next)
-                       fprintf(f, "\t_data+= %d;\n", rna_parameter_size_alloc(dparm->prop));
+                       fprintf(f, "\t_data += %d;\n", rna_parameter_size_alloc(dparm->prop));
        }
 
        if (dfunc->call) {
                fprintf(f, "\t\n");
                fprintf(f, "\t");
-               if (func->c_ret) fprintf(f, "%s= ", func->c_ret->identifier);
+               if (func->c_ret) fprintf(f, "%s = ", func->c_ret->identifier);
                fprintf(f, "%s(", dfunc->call);
 
                first = 1;
@@ -1804,6 +2315,11 @@ static void rna_def_function_funcs(FILE *f, StructDefRNA *dsrna, FunctionDefRNA
                        fprintf(f, "_self");
                        first = 0;
                }
+               else if (func->flag & FUNC_USE_SELF_TYPE) {
+                       if (!first) fprintf(f, ", ");
+                       fprintf(f, "_type");
+                       first = 0;
+               }
 
                if (func->flag & FUNC_USE_MAIN) {
                        if (!first) fprintf(f, ", ");
@@ -1843,7 +2359,7 @@ static void rna_def_function_funcs(FILE *f, StructDefRNA *dsrna, FunctionDefRNA
                        dparm = rna_find_parameter_def(func->c_ret);
                        ptrstr = (((dparm->prop->type == PROP_POINTER) && !(dparm->prop->flag & PROP_RNAPTR)) ||
                                  (dparm->prop->arraydimension)) ? "*" : "";
-                       fprintf(f, "\t*((%s%s%s*)_retdata)= %s;\n", rna_type_struct(dparm->prop),
+                       fprintf(f, "\t*((%s%s%s*)_retdata) = %s;\n", rna_type_struct(dparm->prop),
                                rna_parameter_type_name(dparm->prop), ptrstr, func->c_ret->identifier);
                }
        }
@@ -1869,23 +2385,23 @@ static void rna_auto_types(void)
 
                        if (dp->dnatype) {
                                if (dp->prop->type == PROP_POINTER) {
-                                       PointerPropertyRNA *pprop = (PointerPropertyRNA*)dp->prop;
+                                       PointerPropertyRNA *pprop = (PointerPropertyRNA *)dp->prop;
                                        StructRNA *type;
 
                                        if (!pprop->type && !pprop->get)
-                                               pprop->type = (StructRNA*)rna_find_type(dp->dnatype);
+                                               pprop->type = (StructRNA *)rna_find_type(dp->dnatype);
 
                                        if (pprop->type) {
-                                               type = rna_find_struct((const char*)pprop->type);
+                                               type = rna_find_struct((const char *)pprop->type);
                                                if (type && (type->flag & STRUCT_ID_REFCOUNT))
                                                        pprop->property.flag |= PROP_ID_REFCOUNT;
                                        }
                                }
                                else if (dp->prop->type == PROP_COLLECTION) {
-                                       CollectionPropertyRNA *cprop = (CollectionPropertyRNA*)dp->prop;
+                                       CollectionPropertyRNA *cprop = (CollectionPropertyRNA *)dp->prop;
 
                                        if (!cprop->item_type && !cprop->get && strcmp(dp->dnatype, "ListBase") == 0)
-                                               cprop->item_type = (StructRNA*)rna_find_type(dp->dnatype);
+                                               cprop->item_type = (StructRNA *)rna_find_type(dp->dnatype);
                                }
                        }
                }
@@ -1929,7 +2445,6 @@ static const char *rna_property_subtypename(PropertySubType type)
                case PROP_FILENAME: return "PROP_FILENAME";
                case PROP_DIRPATH: return "PROP_DIRPATH";
                case PROP_BYTESTRING: return "PROP_BYTESTRING";
-               case PROP_TRANSLATE: return "PROP_TRANSLATE";
                case PROP_UNSIGNED: return "PROP_UNSIGNED";
                case PROP_PERCENTAGE: return "PROP_PERCENTAGE";
                case PROP_FACTOR: return "PROP_FACTOR";
@@ -1950,7 +2465,9 @@ static const char *rna_property_subtypename(PropertySubType type)
                case PROP_COORDS: return "PROP_COORDS";
                case PROP_LAYER: return "PROP_LAYER";
                case PROP_LAYER_MEMBER: return "PROP_LAYER_MEMBER";
-               default: {
+               case PROP_PASSWORD: return "PROP_PASSWORD";
+               default:
+               {
                        /* in case we don't have a type preset that includes the subtype */
                        if (RNA_SUBTYPE_UNIT(type)) {
                                return rna_property_subtypename(type & ~RNA_SUBTYPE_UNIT(type));
@@ -1965,16 +2482,16 @@ static const char *rna_property_subtypename(PropertySubType type)
 static const char *rna_property_subtype_unit(PropertySubType type)
 {
        switch (RNA_SUBTYPE_UNIT(type)) {
-               case PROP_UNIT_NONE:            return "PROP_UNIT_NONE";
-               case PROP_UNIT_LENGTH:          return "PROP_UNIT_LENGTH";
-               case PROP_UNIT_AREA:            return "PROP_UNIT_AREA";
-               case PROP_UNIT_VOLUME:          return "PROP_UNIT_VOLUME";
-               case PROP_UNIT_MASS:            return "PROP_UNIT_MASS";
-               case PROP_UNIT_ROTATION:        return "PROP_UNIT_ROTATION";
-               case PROP_UNIT_TIME:            return "PROP_UNIT_TIME";
-               case PROP_UNIT_VELOCITY:        return "PROP_UNIT_VELOCITY";
-               case PROP_UNIT_ACCELERATION:return "PROP_UNIT_ACCELERATION";
-               default:                                        return "PROP_UNIT_UNKNOWN";
+               case PROP_UNIT_NONE:         return "PROP_UNIT_NONE";
+               case PROP_UNIT_LENGTH:       return "PROP_UNIT_LENGTH";
+               case PROP_UNIT_AREA:         return "PROP_UNIT_AREA";
+               case PROP_UNIT_VOLUME:       return "PROP_UNIT_VOLUME";
+               case PROP_UNIT_MASS:         return "PROP_UNIT_MASS";
+               case PROP_UNIT_ROTATION:     return "PROP_UNIT_ROTATION";
+               case PROP_UNIT_TIME:         return "PROP_UNIT_TIME";
+               case PROP_UNIT_VELOCITY:     return "PROP_UNIT_VELOCITY";
+               case PROP_UNIT_ACCELERATION: return "PROP_UNIT_ACCELERATION";
+               default:                     return "PROP_UNIT_UNKNOWN";
        }
 }
 
@@ -2004,7 +2521,7 @@ static void rna_generate_blender(BlenderRNA *brna, FILE *f)
        fprintf(f, "};\n\n");
 }
 
-static void rna_generate_property_prototypes(BlenderRNA *brna, StructRNA *srna, FILE *f)
+static void rna_generate_property_prototypes(BlenderRNA *UNUSED(brna), StructRNA *srna, FILE *f)
 {
        PropertyRNA *prop;
        StructRNA *base;
@@ -2022,12 +2539,12 @@ static void rna_generate_property_prototypes(BlenderRNA *brna, StructRNA *srna,
                fprintf(f, "\n");
 
        for (prop = srna->cont.properties.first; prop; prop = prop->next)
-               fprintf(f, "%s%s rna_%s_%s;\n", (prop->flag & PROP_EXPORT)? "": "", rna_property_structname(prop->type),
+               fprintf(f, "%s%s rna_%s_%s;\n", (prop->flag & PROP_EXPORT) ? "" : "", rna_property_structname(prop->type),
                        srna->identifier, prop->identifier);
        fprintf(f, "\n");
 }
 
-static void rna_generate_parameter_prototypes(BlenderRNA *brna, StructRNA *srna, FunctionRNA *func, FILE *f)
+static void rna_generate_parameter_prototypes(BlenderRNA *UNUSED(brna), StructRNA *srna, FunctionRNA *func, FILE *f)
 {
        PropertyRNA *parm;
 
@@ -2066,7 +2583,7 @@ static void rna_generate_function_prototypes(BlenderRNA *brna, StructRNA *srna,
                fprintf(f, "\n");
 }
 
-static void rna_generate_static_parameter_prototypes(BlenderRNA *brna, StructRNA *srna, FunctionDefRNA *dfunc, FILE *f)
+static void rna_generate_static_parameter_prototypes(FILE *f, StructRNA *srna, FunctionDefRNA *dfunc, const char *name_override, int close_prototype)
 {
        FunctionRNA *func;
        PropertyDefRNA *dparm;
@@ -2082,7 +2599,7 @@ static void rna_generate_static_parameter_prototypes(BlenderRNA *brna, StructRNA
        for (dparm = dfunc->cont.properties.first; dparm; dparm = dparm->next) {
                if (dparm->prop == func->c_ret) {
                        if (dparm->prop->arraydimension)
-                               fprintf(f, "XXX no array return types yet"); /* XXX not supported */
+                               fprintf(f, "XXX no array return types yet");  /* XXX not supported */
                        else if (dparm->prop->type == PROP_POINTER && !(dparm->prop->flag & PROP_RNAPTR))
                                fprintf(f, "%s%s *", rna_type_struct(dparm->prop), rna_parameter_type_name(dparm->prop));
                        else
@@ -2097,7 +2614,10 @@ static void rna_generate_static_parameter_prototypes(BlenderRNA *brna, StructRNA
                fprintf(f, "void ");
 
        /* function name */
-       fprintf(f, "%s(", dfunc->call);
+       if (name_override == NULL || name_override[0] == '\0')
+               fprintf(f, "%s(", dfunc->call);
+       else
+               fprintf(f, "%s(", name_override);
 
        first = 1;
 
@@ -2106,13 +2626,18 @@ static void rna_generate_static_parameter_prototypes(BlenderRNA *brna, StructRNA
                fprintf(f, "struct ID *_selfid");
                first = 0;
        }
-       
+
        if ((func->flag & FUNC_NO_SELF) == 0) {
                if (!first) fprintf(f, ", ");
                if (dsrna->dnaname) fprintf(f, "struct %s *_self", dsrna->dnaname);
                else fprintf(f, "struct %s *_self", srna->identifier);
                first = 0;
        }
+       else if (func->flag & FUNC_USE_SELF_TYPE) {
+               if (!first) fprintf(f, ", ");
+               fprintf(f, "struct StructRNA *_type");
+               first = 0;
+       }
 
        if (func->flag & FUNC_USE_MAIN) {
                if (!first) fprintf(f, ", ");
@@ -2159,17 +2684,19 @@ static void rna_generate_static_parameter_prototypes(BlenderRNA *brna, StructRNA
 
                if (!(flag & PROP_DYNAMIC) && dparm->prop->arraydimension)
                        fprintf(f, "%s%s %s[%u]", rna_type_struct(dparm->prop), rna_parameter_type_name(dparm->prop),
-                               dparm->prop->identifier, dparm->prop->totarraylength);
+                               rna_safe_id(dparm->prop->identifier), dparm->prop->totarraylength);
                else
                        fprintf(f, "%s%s %s%s", rna_type_struct(dparm->prop), rna_parameter_type_name(dparm->prop),
-                               ptrstr, dparm->prop->identifier);
+                               ptrstr, rna_safe_id(dparm->prop->identifier));
 
        }
 
-       fprintf(f, ");\n");
+       fprintf(f, ")");
+       if (close_prototype)
+               fprintf(f, ";\n");
 }
 
-static void rna_generate_static_function_prototypes(BlenderRNA *brna, StructRNA *srna, FILE *f)
+static void rna_generate_static_function_prototypes(BlenderRNA *UNUSED(brna), StructRNA *srna, FILE *f)
 {
        FunctionRNA *func;
        FunctionDefRNA *dfunc;
@@ -2184,7 +2711,50 @@ static void rna_generate_static_function_prototypes(BlenderRNA *brna, StructRNA
                                first = 0;
                        }
 
-                       rna_generate_static_parameter_prototypes(brna, srna, dfunc, f);
+                       rna_generate_static_parameter_prototypes(f, srna, dfunc, NULL, 1);
+               }
+       }
+
+       fprintf(f, "\n");
+}
+
+static void rna_generate_struct_prototypes(FILE *f)
+{
+       StructDefRNA *ds;
+       PropertyDefRNA *dp;
+       FunctionDefRNA *dfunc;
+       const char *structures[2048];
+       int all_structures = 0;
+
+       /* structures definitions */
+       for (ds = DefRNA.structs.first; ds; ds = ds->cont.next) {
+               for (dfunc = ds->functions.first; dfunc; dfunc = dfunc->cont.next) {
+                       if (dfunc->call) {
+                               for (dp = dfunc->cont.properties.first; dp; dp = dp->next) {
+                                       if (dp->prop->type == PROP_POINTER) {
+                                               int a, found = 0;
+                                               const char *struct_name = rna_parameter_type_name(dp->prop);
+
+                                               for (a = 0; a < all_structures; a++) {
+                                                       if (strcmp(struct_name, structures[a]) == 0) {
+                                                               found = 1;
+                                                               break;
+                                                       }
+                                               }
+
+                                               if (found == 0) {
+                                                       fprintf(f, "struct %s;\n", struct_name);
+
+                                                       if (all_structures >= sizeof(structures) / sizeof(structures[0])) {
+                                                               printf("Array size to store all structures names is too small\n");
+                                                               exit(1);
+                                                       }
+
+                                                       structures[all_structures++] = struct_name;
+                                               }
+                                       }
+                               }
+                       }
                }
        }
 
@@ -2199,8 +2769,8 @@ static void rna_generate_property(FILE *f, StructRNA *srna, const char *nest, Pr
        if (nest != NULL) {
                len = strlen(nest);
 
-               strnest = MEM_mallocN(sizeof(char)*(len+2), "rna_generate_property -> strnest");
-               errnest = MEM_mallocN(sizeof(char)*(len+2), "rna_generate_property -> errnest");
+               strnest = MEM_mallocN(sizeof(char) * (len + 2), "rna_generate_property -> strnest");
+               errnest = MEM_mallocN(sizeof(char) * (len + 2), "rna_generate_property -> errnest");
 
                strcpy(strnest, "_"); strcat(strnest, nest);
                strcpy(errnest, "."); strcat(errnest, nest);
@@ -2209,133 +2779,137 @@ static void rna_generate_property(FILE *f, StructRNA *srna, const char *nest, Pr
        }
 
        switch (prop->type) {
-                       case PROP_ENUM: {
-                               EnumPropertyRNA *eprop = (EnumPropertyRNA*)prop;
-                               int i, defaultfound = 0, totflag = 0;
-
-                               if (eprop->item) {
-                                       fprintf(f, "static EnumPropertyItem rna_%s%s_%s_items[%d] = {\n\t", srna->identifier,
-                                               strnest, prop->identifier, eprop->totitem+1);
-
-                                       for (i = 0; i<eprop->totitem; i++) {
-                                               fprintf(f, "{%d, ", eprop->item[i].value);
-                                               rna_print_c_string(f, eprop->item[i].identifier); fprintf(f, ", ");
-                                               fprintf(f, "%d, ", eprop->item[i].icon);
-                                               rna_print_c_string(f, eprop->item[i].name); fprintf(f, ", ");
-                                               rna_print_c_string(f, eprop->item[i].description); fprintf(f, "},\n\t");
-
-                                               if (eprop->item[i].identifier[0]) {
-                                                       if (prop->flag & PROP_ENUM_FLAG) {
-                                                               totflag |= eprop->item[i].value;
-                                                       }
-                                                       else {
-                                                               if (eprop->defaultvalue == eprop->item[i].value) {
-                                                                       defaultfound = 1;
-                                                               }
+               case PROP_ENUM:
+               {
+                       EnumPropertyRNA *eprop = (EnumPropertyRNA *)prop;
+                       int i, defaultfound = 0, totflag = 0;
+
+                       if (eprop->item) {
+                               fprintf(f, "static EnumPropertyItem rna_%s%s_%s_items[%d] = {\n\t", srna->identifier,
+                                       strnest, prop->identifier, eprop->totitem + 1);
+
+                               for (i = 0; i < eprop->totitem; i++) {
+                                       fprintf(f, "{%d, ", eprop->item[i].value);
+                                       rna_print_c_string(f, eprop->item[i].identifier); fprintf(f, ", ");
+                                       fprintf(f, "%d, ", eprop->item[i].icon);
+                                       rna_print_c_string(f, eprop->item[i].name); fprintf(f, ", ");
+                                       rna_print_c_string(f, eprop->item[i].description); fprintf(f, "},\n\t");
+
+                                       if (eprop->item[i].identifier[0]) {
+                                               if (prop->flag & PROP_ENUM_FLAG) {
+                                                       totflag |= eprop->item[i].value;
+                                               }
+                                               else {
+                                                       if (eprop->defaultvalue == eprop->item[i].value) {
+                                                               defaultfound = 1;
                                                        }
                                                }
                                        }
+                               }
 
-                                       fprintf(f, "{0, NULL, 0, NULL, NULL}\n};\n\n");
+                               fprintf(f, "{0, NULL, 0, NULL, NULL}\n};\n\n");
 
-                                       if (prop->flag & PROP_ENUM_FLAG) {
-                                               if (eprop->defaultvalue & ~totflag) {
-                                                       fprintf(stderr, "%s: %s%s.%s, enum default includes unused bits (%d).\n",
-                                                               __func__, srna->identifier, errnest, prop->identifier,
-                                                               eprop->defaultvalue & ~totflag);
-                                                       DefRNA.error = 1;
-                                               }
-                                       }
-                                       else {
-                                               if (!defaultfound) {
-                                                       fprintf(stderr, "%s: %s%s.%s, enum default is not in items.\n",
-                                                               __func__, srna->identifier, errnest, prop->identifier);
-                                                       DefRNA.error = 1;
-                                               }
+                               if (prop->flag & PROP_ENUM_FLAG) {
+                                       if (eprop->defaultvalue & ~totflag) {
+                                               fprintf(stderr, "%s: %s%s.%s, enum default includes unused bits (%d).\n",
+                                                       __func__, srna->identifier, errnest, prop->identifier,
+                                                       eprop->defaultvalue & ~totflag);
+                                               DefRNA.error = 1;
                                        }
                                }
                                else {
-                                       fprintf(stderr, "%s: %s%s.%s, enum must have items defined.\n",
-                                               __func__, srna->identifier, errnest, prop->identifier);
-                                       DefRNA.error = 1;
+                                       if (!defaultfound) {
+                                               fprintf(stderr, "%s: %s%s.%s, enum default is not in items.\n",
+                                                       __func__, srna->identifier, errnest, prop->identifier);
+                                               DefRNA.error = 1;
+                                       }
                                }
-                               break;
                        }
-                       case PROP_BOOLEAN: {
-                               BoolPropertyRNA *bprop = (BoolPropertyRNA*)prop;
-                               unsigned int i;
-
-                               if (prop->arraydimension && prop->totarraylength) {
-                                       fprintf(f, "static int rna_%s%s_%s_default[%u] = {\n\t", srna->identifier, strnest,
-                                               prop->identifier, prop->totarraylength);
-
-                                       for (i = 0; i<prop->totarraylength; i++) {
-                                               if (bprop->defaultarray)
-                                                       fprintf(f, "%d", bprop->defaultarray[i]);
-                                               else
-                                                       fprintf(f, "%d", bprop->defaultvalue);
-                                               if (i != prop->totarraylength-1)
-                                                       fprintf(f, ",\n\t");
-                                       }
+                       else {
+                               fprintf(stderr, "%s: %s%s.%s, enum must have items defined.\n",
+                                       __func__, srna->identifier, errnest, prop->identifier);
+                               DefRNA.error = 1;
+                       }
+                       break;
+               }
+               case PROP_BOOLEAN:
+               {
+                       BoolPropertyRNA *bprop = (BoolPropertyRNA *)prop;
+                       unsigned int i;
+
+                       if (prop->arraydimension && prop->totarraylength) {
+                               fprintf(f, "static int rna_%s%s_%s_default[%u] = {\n\t", srna->identifier, strnest,
+                                       prop->identifier, prop->totarraylength);
 
-                                       fprintf(f, "\n};\n\n");
+                               for (i = 0; i < prop->totarraylength; i++) {
+                                       if (bprop->defaultarray)
+                                               fprintf(f, "%d", bprop->defaultarray[i]);
+                                       else
+                                               fprintf(f, "%d", bprop->defaultvalue);
+                                       if (i != prop->totarraylength - 1)
+                                               fprintf(f, ",\n\t");
                                }
-                               break;
+
+                               fprintf(f, "\n};\n\n");
                        }
-                       case PROP_INT: {
-                               IntPropertyRNA *iprop = (IntPropertyRNA*)prop;
-                               unsigned int i;
-
-                               if (prop->arraydimension && prop->totarraylength) {
-                                       fprintf(f, "static int rna_%s%s_%s_default[%u] = {\n\t", srna->identifier, strnest,
-                                               prop->identifier, prop->totarraylength);
-
-                                       for (i = 0; i<prop->totarraylength; i++) {
-                                               if (iprop->defaultarray)
-                                                       fprintf(f, "%d", iprop->defaultarray[i]);
-                                               else
-                                                       fprintf(f, "%d", iprop->defaultvalue);
-                                               if (i != prop->totarraylength-1)
-                                                       fprintf(f, ",\n\t");
-                                       }
+                       break;
+               }
+               case PROP_INT:
+               {
+                       IntPropertyRNA *iprop = (IntPropertyRNA *)prop;
+                       unsigned int i;
+
+                       if (prop->arraydimension && prop->totarraylength) {
+                               fprintf(f, "static int rna_%s%s_%s_default[%u] = {\n\t", srna->identifier, strnest,
+                                       prop->identifier, prop->totarraylength);
 
-                                       fprintf(f, "\n};\n\n");
+                               for (i = 0; i < prop->totarraylength; i++) {
+                                       if (iprop->defaultarray)
+                                               fprintf(f, "%d", iprop->defaultarray[i]);
+                                       else
+                                               fprintf(f, "%d", iprop->defaultvalue);
+                                       if (i != prop->totarraylength - 1)
+                                               fprintf(f, ",\n\t");
                                }
-                               break;
+
+                               fprintf(f, "\n};\n\n");
                        }
-                       case PROP_FLOAT: {
-                               FloatPropertyRNA *fprop = (FloatPropertyRNA*)prop;
-                               unsigned int i;
-
-                               if (prop->arraydimension && prop->totarraylength) {
-                                       fprintf(f, "static float rna_%s%s_%s_default[%u] = {\n\t", srna->identifier, strnest,
-                                               prop->identifier, prop->totarraylength);
-
-                                       for (i = 0; i<prop->totarraylength; i++) {
-                                               if (fprop->defaultarray)
-                                                       rna_float_print(f, fprop->defaultarray[i]);
-                                               else
-                                                       rna_float_print(f, fprop->defaultvalue);
-                                               if (i != prop->totarraylength-1)
-                                                       fprintf(f, ",\n\t");
-                                       }
+                       break;
+               }
+               case PROP_FLOAT:
+               {
+                       FloatPropertyRNA *fprop = (FloatPropertyRNA *)prop;
+                       unsigned int i;
+
+                       if (prop->arraydimension && prop->totarraylength) {
+                               fprintf(f, "static float rna_%s%s_%s_default[%u] = {\n\t", srna->identifier, strnest,
+                                       prop->identifier, prop->totarraylength);
 
-                                       fprintf(f, "\n};\n\n");
+                               for (i = 0; i < prop->totarraylength; i++) {
+                                       if (fprop->defaultarray)
+                                               rna_float_print(f, fprop->defaultarray[i]);
+                                       else
+                                               rna_float_print(f, fprop->defaultvalue);
+                                       if (i != prop->totarraylength - 1)
+                                               fprintf(f, ",\n\t");
                                }
-                               break;
+
+                               fprintf(f, "\n};\n\n");
                        }
-                       default:
-                               break;
+                       break;
+               }
+               default:
+                       break;
        }
 
        fprintf(f, "%s%s rna_%s%s_%s = {\n",
-               (prop->flag & PROP_EXPORT) ? "": "",
+               (prop->flag & PROP_EXPORT) ? "" : "",
                rna_property_structname(prop->type),
                srna->identifier, strnest, prop->identifier);
 
-       if (prop->next) fprintf(f, "\t{(PropertyRNA*)&rna_%s%s_%s, ", srna->identifier, strnest, prop->next->identifier);
+       if (prop->next) fprintf(f, "\t{(PropertyRNA *)&rna_%s%s_%s, ", srna->identifier, strnest, prop->next->identifier);
        else fprintf(f, "\t{NULL, ");
-       if (prop->prev) fprintf(f, "(PropertyRNA*)&rna_%s%s_%s,\n", srna->identifier, strnest, prop->prev->identifier);
+       if (prop->prev) fprintf(f, "(PropertyRNA *)&rna_%s%s_%s,\n", srna->identifier, strnest, prop->prev->identifier);
        else fprintf(f, "NULL,\n");
        fprintf(f, "\t%d, ", prop->magic);
        rna_print_c_string(f, prop->identifier);
@@ -2355,7 +2929,7 @@ static void rna_generate_property(FILE *f, StructRNA *srna, const char *nest, Pr
                prop->arraylength[2],
                prop->totarraylength);
        fprintf(f, "\t%s%s, %d, %s, %s,\n",
-               (prop->flag & PROP_CONTEXT_UPDATE) ? "(UpdateFunc)": "",
+               (prop->flag & PROP_CONTEXT_UPDATE) ? "(UpdateFunc)" : "",
                rna_function_string(prop->update),
                prop->noteflag,
                rna_function_string(prop->editable),
@@ -2365,112 +2939,138 @@ static void rna_generate_property(FILE *f, StructRNA *srna, const char *nest, Pr
        else fprintf(f, "\t0, -1");
 
        /* our own type - collections/arrays only */
-       if (prop->srna) fprintf(f, ", &RNA_%s", (const char*)prop->srna);
+       if (prop->srna) fprintf(f, ", &RNA_%s", (const char *)prop->srna);
        else fprintf(f, ", NULL");
 
        fprintf(f, "},\n");
 
        switch (prop->type) {
-                       case PROP_BOOLEAN: {
-                               BoolPropertyRNA *bprop = (BoolPropertyRNA*)prop;
-                               fprintf(f, "\t%s, %s, %s, %s, %d, ",
-                                       rna_function_string(bprop->get),
-                                       rna_function_string(bprop->set),
-                                       rna_function_string(bprop->getarray),
-                                       rna_function_string(bprop->setarray),
-                                       bprop->defaultvalue);
-                               if (prop->arraydimension && prop->totarraylength)
-                                       fprintf(f, "rna_%s%s_%s_default\n", srna->identifier, strnest, prop->identifier);
-                               else fprintf(f, "NULL\n");
-                               break;
-                       }
-                       case PROP_INT: {
-                               IntPropertyRNA *iprop = (IntPropertyRNA*)prop;
-                               fprintf(f, "\t%s, %s, %s, %s, %s,\n\t",
-                                       rna_function_string(iprop->get),
-                                       rna_function_string(iprop->set),
-                                       rna_function_string(iprop->getarray),
-                                       rna_function_string(iprop->setarray),
-                                       rna_function_string(iprop->range));
-                               rna_int_print(f, iprop->softmin); fprintf(f, ", ");
-                               rna_int_print(f, iprop->softmax); fprintf(f, ", ");
-                               rna_int_print(f, iprop->hardmin); fprintf(f, ", ");
-                               rna_int_print(f, iprop->hardmax); fprintf(f, ", ");
-                               rna_int_print(f, iprop->step); fprintf(f, ", ");
-                               rna_int_print(f, iprop->defaultvalue); fprintf(f, ", ");
-                               if (prop->arraydimension && prop->totarraylength)
-                                       fprintf(f, "rna_%s%s_%s_default\n", srna->identifier, strnest, prop->identifier);
-                               else fprintf(f, "NULL\n");
-                               break;
-                       }
-                       case PROP_FLOAT: {
-                               FloatPropertyRNA *fprop = (FloatPropertyRNA*)prop;
-                               fprintf(f, "\t%s, %s, %s, %s, %s, ",
-                                       rna_function_string(fprop->get),
-                                       rna_function_string(fprop->set),
-                                       rna_function_string(fprop->getarray),
-                                       rna_function_string(fprop->setarray),
-                                       rna_function_string(fprop->range));
-                               rna_float_print(f, fprop->softmin); fprintf(f, ", ");
-                               rna_float_print(f, fprop->softmax); fprintf(f, ", ");
-                               rna_float_print(f, fprop->hardmin); fprintf(f, ", ");
-                               rna_float_print(f, fprop->hardmax); fprintf(f, ", ");
-                               rna_float_print(f, fprop->step); fprintf(f, ", ");
-                               rna_int_print(f, (int)fprop->precision); fprintf(f, ", ");
-                               rna_float_print(f, fprop->defaultvalue); fprintf(f, ", ");
-                               if (prop->arraydimension && prop->totarraylength)
-                                       fprintf(f, "rna_%s%s_%s_default\n", srna->identifier, strnest, prop->identifier);
-                               else fprintf(f, "NULL\n");
-                               break;
-                       }
-                       case PROP_STRING: {
-                               StringPropertyRNA *sprop = (StringPropertyRNA*)prop;
-                               fprintf(f, "\t%s, %s, %s, %d, ",
-                                       rna_function_string(sprop->get),
-                                       rna_function_string(sprop->length),
-                                       rna_function_string(sprop->set),
-                                       sprop->maxlength);
-                               rna_print_c_string(f, sprop->defaultvalue); fprintf(f, "\n");
-                               break;
-                       }
-                       case PROP_ENUM: {
-                               EnumPropertyRNA *eprop = (EnumPropertyRNA*)prop;
-                               fprintf(f, "\t%s, %s, %s, NULL, ",
-                                       rna_function_string(eprop->get),
-                                       rna_function_string(eprop->set),
-                                       rna_function_string(eprop->itemf));
-                               if (eprop->item)
-                                       fprintf(f, "rna_%s%s_%s_items, ", srna->identifier, strnest, prop->identifier);
-                               else
-                                       fprintf(f, "NULL, ");
-                               fprintf(f, "%d, %d\n", eprop->totitem, eprop->defaultvalue);
-                               break;
-                       }
-                       case PROP_POINTER: {
-                               PointerPropertyRNA *pprop = (PointerPropertyRNA*)prop;
-                               fprintf(f, "\t%s, %s, %s, %s,", rna_function_string(pprop->get),
-                                       rna_function_string(pprop->set),
-                                       rna_function_string(pprop->typef),
-                                       rna_function_string(pprop->poll));
-                               if (pprop->type) fprintf(f, "&RNA_%s\n", (const char*)pprop->type);
-                               else fprintf(f, "NULL\n");
-                               break;
-                       }
-                       case PROP_COLLECTION: {
-                               CollectionPropertyRNA *cprop = (CollectionPropertyRNA*)prop;
-                               fprintf(f, "\t%s, %s, %s, %s, %s, %s, %s, %s, ",
-                                       rna_function_string(cprop->begin),
-                                       rna_function_string(cprop->next),
-                                       rna_function_string(cprop->end),
-                                       rna_function_string(cprop->get),
-                                       rna_function_string(cprop->length),
-                                       rna_function_string(cprop->lookupint),
-                                       rna_function_string(cprop->lookupstring),
-                                       rna_function_string(cprop->assignint));
-                               if (cprop->item_type) fprintf(f, "&RNA_%s\n", (const char*)cprop->item_type);
-                               else fprintf(f, "NULL\n");
-                               break;
-                       }
+               case PROP_BOOLEAN:
+               {
+                       BoolPropertyRNA *bprop = (BoolPropertyRNA *)prop;
+                       fprintf(f, "\t%s, %s, %s, %s, %s, %s, %s, %s, %d, ",
+                               rna_function_string(bprop->get),
+                               rna_function_string(bprop->set),
+                               rna_function_string(bprop->getarray),
+                               rna_function_string(bprop->setarray),
+                               rna_function_string(bprop->get_ex),
+                               rna_function_string(bprop->set_ex),
+                               rna_function_string(bprop->getarray_ex),
+                               rna_function_string(bprop->setarray_ex),
+                               bprop->defaultvalue);
+                       if (prop->arraydimension && prop->totarraylength)
+                               fprintf(f, "rna_%s%s_%s_default\n", srna->identifier, strnest, prop->identifier);
+                       else fprintf(f, "NULL\n");
+                       break;
+               }
+               case PROP_INT:
+               {
+                       IntPropertyRNA *iprop = (IntPropertyRNA *)prop;
+                       fprintf(f, "\t%s, %s, %s, %s, %s, %s, %s, %s, %s, %s,\n\t",
+                               rna_function_string(iprop->get),
+                               rna_function_string(iprop->set),
+                               rna_function_string(iprop->getarray),
+                               rna_function_string(iprop->setarray),
+                               rna_function_string(iprop->range),
+                               rna_function_string(iprop->get_ex),
+                               rna_function_string(iprop->set_ex),
+                               rna_function_string(iprop->getarray_ex),
+                               rna_function_string(iprop->setarray_ex),
+                               rna_function_string(iprop->range_ex));
+                       rna_int_print(f, iprop->softmin); fprintf(f, ", ");
+                       rna_int_print(f, iprop->softmax); fprintf(f, ", ");
+                       rna_int_print(f, iprop->hardmin); fprintf(f, ", ");
+                       rna_int_print(f, iprop->hardmax); fprintf(f, ", ");
+                       rna_int_print(f, iprop->step); fprintf(f, ", ");
+                       rna_int_print(f, iprop->defaultvalue); fprintf(f, ", ");
+                       if (prop->arraydimension && prop->totarraylength)
+                               fprintf(f, "rna_%s%s_%s_default\n", srna->identifier, strnest, prop->identifier);
+                       else fprintf(f, "NULL\n");
+                       break;
+               }
+               case PROP_FLOAT:
+               {
+                       FloatPropertyRNA *fprop = (FloatPropertyRNA *)prop;
+                       fprintf(f, "\t%s, %s, %s, %s, %s, %s, %s, %s, %s, %s, ",
+                               rna_function_string(fprop->get),
+                               rna_function_string(fprop->set),
+                               rna_function_string(fprop->getarray),
+                               rna_function_string(fprop->setarray),
+                               rna_function_string(fprop->range),
+                               rna_function_string(fprop->get_ex),
+                               rna_function_string(fprop->set_ex),
+                               rna_function_string(fprop->getarray_ex),
+                               rna_function_string(fprop->setarray_ex),
+                               rna_function_string(fprop->range_ex));
+                       rna_float_print(f, fprop->softmin); fprintf(f, ", ");
+                       rna_float_print(f, fprop->softmax); fprintf(f, ", ");
+                       rna_float_print(f, fprop->hardmin); fprintf(f, ", ");
+                       rna_float_print(f, fprop->hardmax); fprintf(f, ", ");
+                       rna_float_print(f, fprop->step); fprintf(f, ", ");
+                       rna_int_print(f, (int)fprop->precision); fprintf(f, ", ");
+                       rna_float_print(f, fprop->defaultvalue); fprintf(f, ", ");
+                       if (prop->arraydimension && prop->totarraylength)
+                               fprintf(f, "rna_%s%s_%s_default\n", srna->identifier, strnest, prop->identifier);
+                       else fprintf(f, "NULL\n");
+                       break;
+               }
+               case PROP_STRING:
+               {
+                       StringPropertyRNA *sprop = (StringPropertyRNA *)prop;
+                       fprintf(f, "\t%s, %s, %s, %s, %s, %s, %d, ",
+                               rna_function_string(sprop->get),
+                               rna_function_string(sprop->length),
+                               rna_function_string(sprop->set),
+                               rna_function_string(sprop->get_ex),
+                               rna_function_string(sprop->length_ex),
+                               rna_function_string(sprop->set_ex),
+                               sprop->maxlength);
+                       rna_print_c_string(f, sprop->defaultvalue); fprintf(f, "\n");
+                       break;
+               }
+               case PROP_ENUM:
+               {
+                       EnumPropertyRNA *eprop = (EnumPropertyRNA *)prop;
+                       fprintf(f, "\t%s, %s, %s, %s, %s, NULL, ",
+                               rna_function_string(eprop->get),
+                               rna_function_string(eprop->set),
+                               rna_function_string(eprop->itemf),
+                               rna_function_string(eprop->get_ex),
+                               rna_function_string(eprop->set_ex));
+                       if (eprop->item)
+                               fprintf(f, "rna_%s%s_%s_items, ", srna->identifier, strnest, prop->identifier);
+                       else
+                               fprintf(f, "NULL, ");
+                       fprintf(f, "%d, %d\n", eprop->totitem, eprop->defaultvalue);
+                       break;
+               }
+               case PROP_POINTER:
+               {
+                       PointerPropertyRNA *pprop = (PointerPropertyRNA *)prop;
+                       fprintf(f, "\t%s, %s, %s, %s,", rna_function_string(pprop->get),
+                               rna_function_string(pprop->set),
+                               rna_function_string(pprop->typef),
+                               rna_function_string(pprop->poll));
+                       if (pprop->type) fprintf(f, "&RNA_%s\n", (const char *)pprop->type);
+                       else fprintf(f, "NULL\n");
+                       break;
+               }
+               case PROP_COLLECTION:
+               {
+                       CollectionPropertyRNA *cprop = (CollectionPropertyRNA *)prop;
+                       fprintf(f, "\t%s, %s, %s, %s, %s, %s, %s, %s, ",
+                               rna_function_string(cprop->begin),
+                               rna_function_string(cprop->next),
+                               rna_function_string(cprop->end),
+                               rna_function_string(cprop->get),
+                               rna_function_string(cprop->length),
+                               rna_function_string(cprop->lookupint),
+                               rna_function_string(cprop->lookupstring),
+                               rna_function_string(cprop->assignint));
+                       if (cprop->item_type) fprintf(f, "&RNA_%s\n", (const char *)cprop->item_type);
+                       else fprintf(f, "NULL\n");
+                       break;
+               }
        }
 
        fprintf(f, "};\n\n");
@@ -2481,7 +3081,7 @@ static void rna_generate_property(FILE *f, StructRNA *srna, const char *nest, Pr
        }
 }
 
-static void rna_generate_struct(BlenderRNA *brna, StructRNA *srna, FILE *f)
+static void rna_generate_struct(BlenderRNA *UNUSED(brna), StructRNA *srna, FILE *f)
 {
        FunctionRNA *func;
        FunctionDefRNA *dfunc;
@@ -2500,24 +3100,24 @@ static void rna_generate_struct(BlenderRNA *brna, StructRNA *srna, FILE *f)
                fprintf(f, "%s%s rna_%s_%s_func = {\n", "", "FunctionRNA", srna->identifier, func->identifier);
 
                if (func->cont.next)
-                       fprintf(f, "\t{(FunctionRNA*)&rna_%s_%s_func, ", srna->identifier,
-                               ((FunctionRNA*)func->cont.next)->identifier);
+                       fprintf(f, "\t{(FunctionRNA *)&rna_%s_%s_func, ", srna->identifier,
+                               ((FunctionRNA *)func->cont.next)->identifier);
                else
                        fprintf(f, "\t{NULL, ");
                if (func->cont.prev)
-                       fprintf(f, "(FunctionRNA*)&rna_%s_%s_func,\n", srna->identifier,
-                               ((FunctionRNA*)func->cont.prev)->identifier);
+                       fprintf(f, "(FunctionRNA *)&rna_%s_%s_func,\n", srna->identifier,
+                               ((FunctionRNA *)func->cont.prev)->identifier);
                else
                        fprintf(f, "NULL,\n");
 
                fprintf(f, "\tNULL,\n");
 
                parm = func->cont.properties.first;
-               if (parm) fprintf(f, "\t{(PropertyRNA*)&rna_%s_%s_%s, ", srna->identifier, func->identifier, parm->identifier);
+               if (parm) fprintf(f, "\t{(PropertyRNA *)&rna_%s_%s_%s, ", srna->identifier, func->identifier, parm->identifier);
                else fprintf(f, "\t{NULL, ");
 
                parm = func->cont.properties.last;
-               if (parm) fprintf(f, "(PropertyRNA*)&rna_%s_%s_%s}},\n", srna->identifier, func->identifier, parm->identifier);
+               if (parm) fprintf(f, "(PropertyRNA *)&rna_%s_%s_%s}},\n", srna->identifier, func->identifier, parm->identifier);
                else fprintf(f, "NULL}},\n");
 
                fprintf(f, "\t");
@@ -2530,7 +3130,7 @@ static void rna_generate_struct(BlenderRNA *brna, StructRNA *srna, FILE *f)
                else fprintf(f, "\tNULL,\n");
 
                if (func->c_ret)
-                       fprintf(f, "\t(PropertyRNA*)&rna_%s_%s_%s\n", srna->identifier, func->identifier, func->c_ret->identifier);
+                       fprintf(f, "\t(PropertyRNA *)&rna_%s_%s_%s\n", srna->identifier, func->identifier, func->c_ret->identifier);
                else
                        fprintf(f, "\tNULL\n");
 
@@ -2540,19 +3140,19 @@ static void rna_generate_struct(BlenderRNA *brna, StructRNA *srna, FILE *f)
 
        fprintf(f, "StructRNA RNA_%s = {\n", srna->identifier);
 
-       if (srna->cont.next) fprintf(f, "\t{(ContainerRNA *)&RNA_%s, ", ((StructRNA*)srna->cont.next)->identifier);
+       if (srna->cont.next) fprintf(f, "\t{(ContainerRNA *)&RNA_%s, ", ((StructRNA *)srna->cont.next)->identifier);
        else fprintf(f, "\t{NULL, ");
-       if (srna->cont.prev) fprintf(f, "(ContainerRNA *)&RNA_%s,\n", ((StructRNA*)srna->cont.prev)->identifier);
+       if (srna->cont.prev) fprintf(f, "(ContainerRNA *)&RNA_%s,\n", ((StructRNA *)srna->cont.prev)->identifier);
        else fprintf(f, "NULL,\n");
 
        fprintf(f, "\tNULL,\n");
 
        prop = srna->cont.properties.first;
-       if (prop) fprintf(f, "\t{(PropertyRNA*)&rna_%s_%s, ", srna->identifier, prop->identifier);
+       if (prop) fprintf(f, "\t{(PropertyRNA *)&rna_%s_%s, ", srna->identifier, prop->identifier);
        else fprintf(f, "\t{NULL, ");
 
        prop = srna->cont.properties.last;
-       if (prop) fprintf(f, "(PropertyRNA*)&rna_%s_%s}},\n", srna->identifier, prop->identifier);
+       if (prop) fprintf(f, "(PropertyRNA *)&rna_%s_%s}},\n", srna->identifier, prop->identifier);
        else fprintf(f, "NULL}},\n");
        fprintf(f, "\t");
        rna_print_c_string(f, srna->identifier);
@@ -2571,7 +3171,7 @@ static void rna_generate_struct(BlenderRNA *brna, StructRNA *srna, FILE *f)
                while (base->base && base->base->nameproperty == prop)
                        base = base->base;
 
-               fprintf(f, "\t(PropertyRNA*)&rna_%s_%s, ", base->identifier, prop->identifier);
+               fprintf(f, "\t(PropertyRNA *)&rna_%s_%s, ", base->identifier, prop->identifier);
        }
        else fprintf(f, "\tNULL, ");
 
@@ -2579,7 +3179,7 @@ static void rna_generate_struct(BlenderRNA *brna, StructRNA *srna, FILE *f)
        base = srna;
        while (base->base && base->base->iteratorproperty == prop)
                base = base->base;
-       fprintf(f, "(PropertyRNA*)&rna_%s_rna_properties,\n", base->identifier);
+       fprintf(f, "(PropertyRNA *)&rna_%s_rna_properties,\n", base->identifier);
 
        if (srna->base) fprintf(f, "\t&RNA_%s,\n", srna->base->identifier);
        else fprintf(f, "\tNULL,\n");
@@ -2601,11 +3201,11 @@ static void rna_generate_struct(BlenderRNA *brna, StructRNA *srna, FILE *f)
        }
 
        func = srna->functions.first;
-       if (func) fprintf(f, "\t{(FunctionRNA*)&rna_%s_%s_func, ", srna->identifier, func->identifier);
+       if (func) fprintf(f, "\t{(FunctionRNA *)&rna_%s_%s_func, ", srna->identifier, func->identifier);
        else fprintf(f, "\t{NULL, ");
 
        func = srna->functions.last;
-       if (func) fprintf(f, "(FunctionRNA*)&rna_%s_%s_func}\n", srna->identifier, func->identifier);
+       if (func) fprintf(f, "(FunctionRNA *)&rna_%s_%s_func}\n", srna->identifier, func->identifier);
        else fprintf(f, "NULL}\n");
 
        fprintf(f, "};\n");
@@ -2649,7 +3249,7 @@ static RNAProcessItem PROCESS_ITEMS[] = {
        {"rna_main.c", "rna_main_api.c", RNA_def_main},
        {"rna_material.c", "rna_material_api.c", RNA_def_material},
        {"rna_mesh.c", "rna_mesh_api.c", RNA_def_mesh},
-       {"rna_meta.c", NULL, RNA_def_meta},
+       {"rna_meta.c", "rna_meta_api.c", RNA_def_meta},
        {"rna_modifier.c", NULL, RNA_def_modifier},
        {"rna_nla.c", NULL, RNA_def_nla},
        {"rna_nodetree.c", NULL, RNA_def_nodetree},
@@ -2660,6 +3260,7 @@ static RNAProcessItem PROCESS_ITEMS[] = {
        {"rna_pose.c", "rna_pose_api.c", RNA_def_pose},
        {"rna_property.c", NULL, RNA_def_gameproperty},
        {"rna_render.c", NULL, RNA_def_render},
+       {"rna_rigidbody.c", NULL, RNA_def_rigidbody},
        {"rna_scene.c", "rna_scene_api.c", RNA_def_scene},
        {"rna_screen.c", NULL, RNA_def_screen},
        {"rna_sculpt_paint.c", NULL, RNA_def_sculpt_paint},
@@ -2680,7 +3281,8 @@ static RNAProcessItem PROCESS_ITEMS[] = {
        {"rna_movieclip.c", NULL, RNA_def_movieclip},
        {"rna_tracking.c", NULL, RNA_def_tracking},
        {"rna_mask.c", NULL, RNA_def_mask},
-       {NULL, NULL}};
+       {NULL, NULL}
+};
 
 static void rna_generate(BlenderRNA *brna, FILE *f, const char *filename, const char *api_filename)
 {
@@ -2700,6 +3302,8 @@ static void rna_generate(BlenderRNA *brna, FILE *f, const char *filename, const
        fprintf(f, "#include <string.h>\n\n");
        fprintf(f, "#include <stddef.h>\n\n");
 
+       fprintf(f, "#include \"MEM_guardedalloc.h\"\n\n");
+
        fprintf(f, "#include \"DNA_ID.h\"\n");
        fprintf(f, "#include \"DNA_scene_types.h\"\n");
 
@@ -2738,8 +3342,13 @@ static void rna_generate(BlenderRNA *brna, FILE *f, const char *filename, const
 
        for (ds = DefRNA.structs.first; ds; ds = ds->cont.next) {
                if (!filename || ds->filename == filename) {
-                       for (dfunc = ds->functions.first; dfunc; dfunc = dfunc->cont.next)
+                       for (dp = ds->cont.properties.first; dp; dp = dp->next)
+                               rna_def_property_wrapper_funcs(f, ds, dp);
+
+                       for (dfunc = ds->functions.first; dfunc; dfunc = dfunc->cont.next) {
+                               rna_def_function_wrapper_funcs(f, ds, dfunc);
                                rna_def_function_funcs(f, ds, dfunc);
+                       }
 
                        rna_generate_static_function_prototypes(brna, ds->srna, f);
                }
@@ -2758,11 +3367,12 @@ static void rna_generate(BlenderRNA *brna, FILE *f, const char *filename, const
        }
 }
 
-static void rna_generate_header(BlenderRNA *brna, FILE *f)
+static void rna_generate_header(BlenderRNA *UNUSED(brna), FILE *f)
 {
        StructDefRNA *ds;
        PropertyDefRNA *dp;
        StructRNA *srna;
+       FunctionDefRNA *dfunc;
 
        fprintf(f, "\n#ifndef __RNA_BLENDER_H__\n");
        fprintf(f, "#define __RNA_BLENDER_H__\n\n");
@@ -2779,7 +3389,7 @@ static void rna_generate_header(BlenderRNA *brna, FILE *f)
        fprintf(f, "    { \\\n");
        fprintf(f, "            CollectionPropertyIterator rna_macro_iter; \\\n");
        fprintf(f, "            for (property##_begin(&rna_macro_iter, sptr); rna_macro_iter.valid; "
-                  "property##_next(&rna_macro_iter)) { \\\n");
+               "property##_next(&rna_macro_iter)) { \\\n");
        fprintf(f, "                    itemptr= rna_macro_iter.ptr;\n\n");
 
        fprintf(f, "#define FOREACH_END(property) \\\n");
@@ -2800,6 +3410,9 @@ static void rna_generate_header(BlenderRNA *brna, FILE *f)
 
                for (dp = ds->cont.properties.first; dp; dp = dp->next)
                        rna_def_property_funcs_header(f, ds->srna, dp);
+
+               for (dfunc = ds->functions.first; dfunc; dfunc = dfunc->cont.next)
+                       rna_def_function_funcs_header(f, ds->srna, dfunc);
        }
 
        fprintf(f, "#ifdef __cplusplus\n}\n#endif\n\n");
@@ -2815,49 +3428,166 @@ static const char *cpp_classes = ""
 "namespace BL {\n"
 "\n"
 "#define BOOLEAN_PROPERTY(sname, identifier) \\\n"
-"      inline bool sname::identifier(void) { return sname##_##identifier##_get(&ptr)? true: false; }\n"
+"      inline bool sname::identifier(void) { return sname##_##identifier##_get(&ptr) ? true: false; } \\\n"
+"      inline void sname::identifier(int value) { sname##_##identifier##_set(&ptr, value); }\n"
 "\n"
 "#define BOOLEAN_ARRAY_PROPERTY(sname, size, identifier) \\\n"
 "      inline Array<int,size> sname::identifier(void) \\\n"
-"              { Array<int, size> ar; sname##_##identifier##_get(&ptr, ar.data); return ar; }\n"
+"              { Array<int, size> ar; sname##_##identifier##_get(&ptr, ar.data); return ar; } \\\n"
+"      inline void sname::identifier(int values[size]) \\\n"
+"              { sname##_##identifier##_set(&ptr, values); } \\\n"
+"\n"
+"#define BOOLEAN_DYNAMIC_ARRAY_PROPERTY(sname, identifier) \\\n"
+"      inline DynamicArray<int> sname::identifier(void) { \\\n"
+"              int arraylen[3]; \\\n"
+"              int len = sname##_##identifier##_get_length(&ptr, arraylen); \\\n"
+"              DynamicArray<int> ar(len); \\\n"
+"              sname##_##identifier##_get(&ptr, ar.data); \\\n"
+"              return ar; } \\\n"
+"      inline void sname::identifier(int values[]) \\\n"
+"              { sname##_##identifier##_set(&ptr, values); } \\\n"
 "\n"
 "#define INT_PROPERTY(sname, identifier) \\\n"
-"      inline int sname::identifier(void) { return sname##_##identifier##_get(&ptr); }\n"
+"      inline int sname::identifier(void) { return sname##_##identifier##_get(&ptr); } \\\n"
+"      inline void sname::identifier(int value) { sname##_##identifier##_set(&ptr, value); }\n"
 "\n"
 "#define INT_ARRAY_PROPERTY(sname, size, identifier) \\\n"
 "      inline Array<int,size> sname::identifier(void) \\\n"
-"              { Array<int, size> ar; sname##_##identifier##_get(&ptr, ar.data); return ar; }\n"
+"              { Array<int, size> ar; sname##_##identifier##_get(&ptr, ar.data); return ar; } \\\n"
+"      inline void sname::identifier(int values[size]) \\\n"
+"              { sname##_##identifier##_set(&ptr, values); } \\\n"
+"\n"
+"#define INT_DYNAMIC_ARRAY_PROPERTY(sname, identifier) \\\n"
+"      inline DynamicArray<int> sname::identifier(void) { \\\n"
+"              int arraylen[3]; \\\n"
+"              int len = sname##_##identifier##_get_length(&ptr, arraylen); \\\n"
+"              DynamicArray<int> ar(len); \\\n"
+"              sname##_##identifier##_get(&ptr, ar.data); \\\n"
+"              return ar; } \\\n"
+"      inline void sname::identifier(int values[]) \\\n"
+"              { sname##_##identifier##_set(&ptr, values); } \\\n"
 "\n"
 "#define FLOAT_PROPERTY(sname, identifier) \\\n"
-"      inline float sname::identifier(void) { return sname##_##identifier##_get(&ptr); }\n"
+"      inline float sname::identifier(void) { return sname##_##identifier##_get(&ptr); } \\\n"
+"      inline void sname::identifier(float value) { sname##_##identifier##_set(&ptr, value); }\n"
 "\n"
 "#define FLOAT_ARRAY_PROPERTY(sname, size, identifier) \\\n"
 "      inline Array<float,size> sname::identifier(void) \\\n"
-"              { Array<float, size> ar; sname##_##identifier##_get(&ptr, ar.data); return ar; }\n"
+"              { Array<float, size> ar; sname##_##identifier##_get(&ptr, ar.data); return ar; } \\\n"
+"      inline void sname::identifier(float values[size]) \\\n"
+"              { sname##_##identifier##_set(&ptr, values); } \\\n"
+"\n"
+"#define FLOAT_DYNAMIC_ARRAY_PROPERTY(sname, identifier) \\\n"
+"      inline DynamicArray<float> sname::identifier(void) { \\\n"
+"              int arraylen[3]; \\\n"
+"              int len = sname##_##identifier##_get_length(&ptr, arraylen); \\\n"
+"              DynamicArray<float> ar(len); \\\n"
+"              sname##_##identifier##_get(&ptr, ar.data); \\\n"
+"              return ar; } \\\n"
+"      inline void sname::identifier(float values[]) \\\n"
+"              { sname##_##identifier##_set(&ptr, values); } \\\n"
 "\n"
 "#define ENUM_PROPERTY(type, sname, identifier) \\\n"
-"      inline sname::type sname::identifier(void) { return (type)sname##_##identifier##_get(&ptr); }\n"
+"      inline sname::type sname::identifier(void) { return (type)sname##_##identifier##_get(&ptr); } \\\n"
+"      inline void sname::identifier(sname::type value) { sname##_##identifier##_set(&ptr, value); }\n"
 "\n"
 "#define STRING_PROPERTY(sname, identifier) \\\n"
 "      inline std::string sname::identifier(void) { \\\n"
 "              int len= sname##_##identifier##_length(&ptr); \\\n"
 "              std::string str; str.resize(len); \\\n"
 "              sname##_##identifier##_get(&ptr, &str[0]); return str; } \\\n"
+"      inline void sname::identifier(const std::string& value) { \\\n"
+"              sname##_##identifier##_set(&ptr, value.c_str()); } \\\n"
 "\n"
 "#define POINTER_PROPERTY(type, sname, identifier) \\\n"
 "      inline type sname::identifier(void) { return type(sname##_##identifier##_get(&ptr)); }\n"
 "\n"
-"#define COLLECTION_PROPERTY(type, sname, identifier) \\\n"
+"#define COLLECTION_PROPERTY_LENGTH_FALSE(sname, identifier) \\\n"
+"      inline static int sname##_##identifier##_length_wrap(PointerRNA *ptr) \\\n"
+"      { \\\n"
+"              CollectionPropertyIterator iter; \\\n"
+"              int length = 0; \\\n"
+"              sname##_##identifier##_begin(&iter, ptr); \\\n"
+"              while (iter.valid) { \\\n"
+"                      sname##_##identifier##_next(&iter); \\\n"
+"                      ++length; \\\n"
+"              } \\\n"
+"              sname##_##identifier##_end(&iter); \\\n"
+"              return length; \\\n"
+"      } \n"
+"#define COLLECTION_PROPERTY_LENGTH_TRUE(sname, identifier) \\\n"
+"      inline static int sname##_##identifier##_length_wrap(PointerRNA *ptr) \\\n"
+"      { return sname##_##identifier##_length(ptr); } \n"
+"\n"
+"#define COLLECTION_PROPERTY_LOOKUP_INT_FALSE(sname, identifier) \\\n"
+"      inline static int sname##_##identifier##_lookup_int_wrap(PointerRNA *ptr, int key, PointerRNA *r_ptr) \\\n"
+"      { \\\n"
+"              CollectionPropertyIterator iter; \\\n"
+"              int i = 0, found = 0; \\\n"
+"              sname##_##identifier##_begin(&iter, ptr); \\\n"
+"              while (iter.valid) { \\\n"
+"                      if (i == key) { \\\n"
+"                              *r_ptr = iter.ptr; \\\n"
+"                              found = 1; \\\n"
+"                              break; \\\n"
+"                      } \\\n"
+"                      sname##_##identifier##_next(&iter); \\\n"
+"                      ++i; \\\n"
+"              } \\\n"
+"              sname##_##identifier##_end(&iter); \\\n"
+"              if (!found) \\\n"
+"                      memset(r_ptr, 0, sizeof(*r_ptr)); \\\n"
+"              return found; \\\n"
+"      } \n"
+"#define COLLECTION_PROPERTY_LOOKUP_INT_TRUE(sname, identifier) \\\n"
+"      inline static int sname##_##identifier##_lookup_int_wrap(PointerRNA *ptr, int key, PointerRNA *r_ptr) \\\n"
+"      { return sname##_##identifier##_lookup_int(ptr, key, r_ptr); } \n"
+"\n"
+"#define COLLECTION_PROPERTY_LOOKUP_STRING_FALSE(sname, identifier) \\\n"
+"      inline static int sname##_##identifier##_lookup_string_wrap(PointerRNA *ptr, const char *key, PointerRNA *r_ptr) \\\n"
+"      { \\\n"
+"              CollectionPropertyIterator iter; \\\n"
+"              int found = 0; \\\n"
+"              PropertyRNA *item_name_prop = RNA_struct_name_property(ptr->type); \\\n"
+"              sname##_##identifier##_begin(&iter, ptr); \\\n"
+"              while (iter.valid && !found) { \\\n"
+"                      char name_fixed[32]; \\\n"
+"                      const char *name; \\\n"
+"                      int name_length; \\\n"
+"                      name = RNA_property_string_get_alloc(&iter.ptr, item_name_prop, name_fixed, sizeof(name_fixed), &name_length); \\\n"
+"                      if (!strncmp(name, key, name_length)) { \\\n"
+"                              *r_ptr = iter.ptr; \\\n"
+"                              found = 1; \\\n"
+"                      } \\\n"
+"                      if (name_fixed != name) \\\n"
+"                              MEM_freeN((void *) name); \\\n"
+"                      sname##_##identifier##_next(&iter); \\\n"
+"              } \\\n"
+"              sname##_##identifier##_end(&iter); \\\n"
+"              if (!found) \\\n"
+"                      memset(r_ptr, 0, sizeof(*r_ptr)); \\\n"
+"              return found; \\\n"
+"      } \n"
+"#define COLLECTION_PROPERTY_LOOKUP_STRING_TRUE(sname, identifier) \\\n"
+"      inline static int sname##_##identifier##_lookup_string_wrap(PointerRNA *ptr, const char *key, PointerRNA *r_ptr) \\\n"
+"      { return sname##_##identifier##_lookup_string(ptr, key, r_ptr); } \n"
+"\n"
+"#define COLLECTION_PROPERTY(collection_funcs, type, sname, identifier, has_length, has_lookup_int, has_lookup_string) \\\n"
 "      typedef CollectionIterator<type, sname##_##identifier##_begin, \\\n"
 "              sname##_##identifier##_next, sname##_##identifier##_end> identifier##_iterator; \\\n"
+"      COLLECTION_PROPERTY_LENGTH_##has_length(sname, identifier) \\\n"
+"      COLLECTION_PROPERTY_LOOKUP_INT_##has_lookup_int(sname, identifier) \\\n"
+"      COLLECTION_PROPERTY_LOOKUP_STRING_##has_lookup_string(sname, identifier) \\\n"
 "      Collection<sname, type, sname##_##identifier##_begin, \\\n"
-"              sname##_##identifier##_next, sname##_##identifier##_end> identifier;\n"
+"              sname##_##identifier##_next, sname##_##identifier##_end, \\\n"
+"              sname##_##identifier##_length_wrap, \\\n"
+"              sname##_##identifier##_lookup_int_wrap, sname##_##identifier##_lookup_string_wrap, collection_funcs> identifier;\n"
 "\n"
 "class Pointer {\n"
 "public:\n"
-"      Pointer(const PointerRNAp) : ptr(p) { }\n"
+"      Pointer(const PointerRNA &p) : ptr(p) { }\n"
 "      operator const PointerRNA&() { return ptr; }\n"
-"      bool is_a(StructRNA *type) { return RNA_struct_is_a(ptr.type, type)? true: false; }\n"
+"      bool is_a(StructRNA *type) { return RNA_struct_is_a(ptr.type, type) ? true: false; }\n"
 "      operator void*() { return ptr.data; }\n"
 "      operator bool() { return ptr.data != NULL; }\n"
 "\n"
@@ -2870,17 +3600,44 @@ static const char *cpp_classes = ""
 "public:\n"
 "      T data[Tsize];\n"
 "\n"
-"   Array() {}\n"
-"      Array(const Array<T, Tsize>& other) { memcpy(data, other.data, sizeof(T)*Tsize); }\n"
-"      const Array<T, Tsize>& operator=(const Array<T, Tsize>& other) { memcpy(data, other.data, sizeof(T)*Tsize); "
+"      Array() {}\n"
+"      Array(const Array<T, Tsize>& other) { memcpy(data, other.data, sizeof(T) * Tsize); }\n"
+"      const Array<T, Tsize>& operator=(const Array<T, Tsize>& other) { memcpy(data, other.data, sizeof(T) * Tsize); "
 "return *this; }\n"
 "\n"
 "      operator T*() { return data; }\n"
 "};\n"
 "\n"
+"template<typename T>\n"
+"class DynamicArray {\n"
+"public:\n"
+"      T *data;\n"
+"      int length;\n"
+"\n"
+"      DynamicArray() : data(NULL), length(0) {}\n"
+"      DynamicArray(int new_length) : data(NULL), length(new_length) { data = (float *)malloc(sizeof(T) * new_length); }\n"
+"      DynamicArray(const DynamicArray<T>& other) { copy_from(other); }\n"
+"      const DynamicArray<T>& operator=(const DynamicArray<T>& other) { copy_from(other); return *this; }\n"
+"\n"
+"      ~DynamicArray() { if (data) free(data); }\n"
+"\n"
+"      operator T*() { return data; }\n"
+"\n"
+"protected:\n"
+"      void copy_from(const DynamicArray<T>& other) {\n"
+"              if (data) free(data);\n"
+"              data = (float *)malloc(sizeof(T) * other.length);\n"
+"              memcpy(data, other.data, sizeof(T) * other.length);\n"
+"              length = other.length;\n"
+"      }\n"
+"};\n"
+"\n"
 "typedef void (*TBeginFunc)(CollectionPropertyIterator *iter, PointerRNA *ptr);\n"
 "typedef void (*TNextFunc)(CollectionPropertyIterator *iter);\n"
 "typedef void (*TEndFunc)(CollectionPropertyIterator *iter);\n"
+"typedef int (*TLengthFunc)(PointerRNA *ptr);\n"
+"typedef int (*TLookupIntFunc)(PointerRNA *ptr, int key, PointerRNA *r_ptr);\n"
+"typedef int (*TLookupStringFunc)(PointerRNA *ptr, const char *key, PointerRNA *r_ptr);\n"
 "\n"
 "template<typename T, TBeginFunc Tbegin, TNextFunc Tnext, TEndFunc Tend>\n"
 "class CollectionIterator {\n"
@@ -2899,8 +3656,8 @@ static const char *cpp_classes = ""
 "      bool operator!=(const CollectionIterator<T, Tbegin, Tnext, Tend>& other) "
 "{ return iter.valid != other.iter.valid; }\n"
 "\n"
-"      void begin(const Pointerptr)\n"
-"      { if (init) Tend(&iter); Tbegin(&iter, (PointerRNA*)&ptr.ptr); t = T(iter.ptr); init = true; }\n"
+"      void begin(const Pointer &ptr)\n"
+"      { if (init) Tend(&iter); Tbegin(&iter, (PointerRNA *)&ptr.ptr); t = T(iter.ptr); init = true; }\n"
 "\n"
 "private:\n"
 "      const CollectionIterator<T, Tbegin, Tnext, Tend>& operator="
@@ -2911,26 +3668,97 @@ static const char *cpp_classes = ""
 "      bool init;\n"
 "};\n"
 "\n"
-"template<typename Tp, typename T, TBeginFunc Tbegin, TNextFunc Tnext, TEndFunc Tend>\n"
-"class Collection {\n"
+"template<typename Tp, typename T, TBeginFunc Tbegin, TNextFunc Tnext, TEndFunc Tend,\n"
+"         TLengthFunc Tlength, TLookupIntFunc Tlookup_int, TLookupStringFunc Tlookup_string,\n"
+"         typename Tcollection_funcs>\n"
+"class Collection : public Tcollection_funcs {\n"
 "public:\n"
-"      Collection(const PointerRNA& p) : ptr(p) {}\n"
+"      Collection(const PointerRNA &p) : Tcollection_funcs(p), ptr(p)  {}\n"
 "\n"
 "      void begin(CollectionIterator<T, Tbegin, Tnext, Tend>& iter)\n"
 "      { iter.begin(ptr); }\n"
 "      CollectionIterator<T, Tbegin, Tnext, Tend> end()\n"
 "      { return CollectionIterator<T, Tbegin, Tnext, Tend>(); } /* test */ \n"
+""
+"      int length()\n"
+"      { return Tlength(&ptr); }\n"
+"      T operator[](int key)\n"
+"      { PointerRNA r_ptr; Tlookup_int(&ptr, key, &r_ptr); return T(r_ptr); }\n"
+"      T operator[](const std::string &key)\n"
+"      { PointerRNA r_ptr; Tlookup_string(&ptr, key.c_str(), &r_ptr); return T(r_ptr); }\n"
 "\n"
 "private:\n"
 "      PointerRNA ptr;\n"
 "};\n"
+"\n"
+"class DefaultCollectionFunctions {\n"
+"public:\n"
+"      DefaultCollectionFunctions(const PointerRNA &p) {}\n"
+"};\n"
+"\n"
 "\n";
 
-static void rna_generate_header_cpp(BlenderRNA *brna, FILE *f)
+static int rna_is_collection_prop(PropertyRNA *prop)
+{
+       if (!(prop->flag & (PROP_IDPROPERTY | PROP_BUILTIN)))
+               if (prop->type == PROP_COLLECTION)
+                       return 1;
+
+       return 0;
+}
+
+static int rna_is_collection_functions_struct(const char **collection_structs, const char *struct_name)
+{
+       int a = 0, found = 0;
+
+       while (collection_structs[a]) {
+               if (!strcmp(collection_structs[a], struct_name)) {
+                       found = 1;
+                       break;
+               }
+               a++;
+       }
+
+       return found;
+}
+
+static void rna_generate_header_class_cpp(StructDefRNA *ds, FILE *f)
+{
+       StructRNA *srna = ds->srna;
+       PropertyDefRNA *dp;
+       FunctionDefRNA *dfunc;
+
+       fprintf(f, "/**************** %s ****************/\n\n", srna->name);
+
+       fprintf(f, "class %s : public %s {\n", srna->identifier, (srna->base) ? srna->base->identifier : "Pointer");
+       fprintf(f, "public:\n");
+       fprintf(f, "\t%s(const PointerRNA &ptr_arg) :\n\t\t%s(ptr_arg)", srna->identifier,
+               (srna->base) ? srna->base->identifier : "Pointer");
+       for (dp = ds->cont.properties.first; dp; dp = dp->next)
+               if (rna_is_collection_prop(dp->prop))
+                       fprintf(f, ",\n\t\t%s(ptr_arg)", dp->prop->identifier);
+       fprintf(f, "\n\t\t{}\n\n");
+
+       for (dp = ds->cont.properties.first; dp; dp = dp->next)
+               rna_def_property_funcs_header_cpp(f, ds->srna, dp);
+
+       fprintf(f, "\n");
+       for (dfunc = ds->functions.first; dfunc; dfunc = dfunc->cont.next)
+               rna_def_struct_function_header_cpp(f, srna, dfunc);
+
+       fprintf(f, "};\n\n");
+}
+
+static void rna_generate_header_cpp(BlenderRNA *UNUSED(brna), FILE *f)
 {
        StructDefRNA *ds;
        PropertyDefRNA *dp;
        StructRNA *srna;
+       FunctionDefRNA *dfunc;
+       const char *first_collection_func_struct = NULL;
+       const char *collection_func_structs[256] = {NULL};
+       int all_collection_func_structs = 0;
+       int max_collection_func_structs = sizeof(collection_func_structs) / sizeof(collection_func_structs[0]) - 1;
 
        fprintf(f, "\n#ifndef __RNA_BLENDER_CPP_H__\n");
        fprintf(f, "#define __RNA_BLENDER_CPP_H__\n\n");
@@ -2947,38 +3775,86 @@ static void rna_generate_header_cpp(BlenderRNA *brna, FILE *f)
 
        fprintf(f, "/**************** Declarations ****************/\n\n");
 
-       for (ds = DefRNA.structs.first; ds; ds = ds->cont.next)
+       for (ds = DefRNA.structs.first; ds; ds = ds->cont.next) {
                fprintf(f, "class %s;\n", ds->srna->identifier);
+       }
        fprintf(f, "\n");
 
+       /* first get list of all structures used as collection functions, so they'll be declared first */
+       for (ds = DefRNA.structs.first; ds; ds = ds->cont.next) {
+               for (dp = ds->cont.properties.first; dp; dp = dp->next) {
+                       if (rna_is_collection_prop(dp->prop)) {
+                               PropertyRNA *prop = dp->prop;
+
+                               if (prop->srna) {
+                                       /* store name of structure which first uses custom functions for collections */
+                                       if (first_collection_func_struct == NULL)
+                                               first_collection_func_struct = ds->srna->identifier;
+
+                                       if (!rna_is_collection_functions_struct(collection_func_structs, (char *)prop->srna)) {
+                                               if (all_collection_func_structs >= max_collection_func_structs) {
+                                                       printf("Array size to store all collection structures names is too small\n");
+                                                       exit(1);
+                                               }
+
+                                               collection_func_structs[all_collection_func_structs++] = (char *)prop->srna;
+                                       }
+                               }
+                       }
+               }
+       }
+
+       /* declare all structures in such order:
+        * - first N structures which doesn't use custom functions for collections
+        * - all structures used for custom functions in collections
+        * - all the rest structures
+        * such an order prevents usage of non-declared classes
+        */
        for (ds = DefRNA.structs.first; ds; ds = ds->cont.next) {
                srna = ds->srna;
 
-               fprintf(f, "/**************** %s ****************/\n\n", srna->name);
+               if (!strcmp(srna->identifier, first_collection_func_struct)) {
+                       StructDefRNA *ds2;
+                       StructRNA *srna2;
 
-               fprintf(f, "class %s : public %s {\n", srna->identifier, (srna->base)? srna->base->identifier: "Pointer");
-               fprintf(f, "public:\n");
-               fprintf(f, "\t%s(const PointerRNA& ptr) :\n\t\t%s(ptr)", srna->identifier,
-                       (srna->base)? srna->base->identifier: "Pointer");
-               for (dp = ds->cont.properties.first; dp; dp = dp->next)
-                       if (!(dp->prop->flag & (PROP_IDPROPERTY|PROP_BUILTIN)))
-                               if (dp->prop->type == PROP_COLLECTION)
-                                       fprintf(f, ",\n\t\t%s(ptr)", dp->prop->identifier);
-               fprintf(f, "\n\t\t{}\n\n");
+                       for (ds2 = DefRNA.structs.first; ds2; ds2 = ds2->cont.next) {
+                               srna2 = ds2->srna;
 
-               for (dp = ds->cont.properties.first; dp; dp = dp->next)
-                       rna_def_property_funcs_header_cpp(f, ds->srna, dp);
-               fprintf(f, "};\n\n");
+                               if (rna_is_collection_functions_struct(collection_func_structs, srna2->identifier)) {
+                                       rna_generate_header_class_cpp(ds2, f);
+                               }
+                       }
+               }
+
+               if (!rna_is_collection_functions_struct(collection_func_structs, srna->identifier))
+                       rna_generate_header_class_cpp(ds, f);
        }
 
+       fprintf(f, "} /* namespace BL */\n");
 
+       fprintf(f, "\n");
        fprintf(f, "/**************** Implementation ****************/\n");
+       fprintf(f, "\n");
+
+       fprintf(f, "/* Structure prototypes */\n\n");
+       fprintf(f, "extern \"C\" {\n");
+       rna_generate_struct_prototypes(f);
+       fprintf(f, "}\n\n");
+
+       fprintf(f, "namespace BL {\n");
 
        for (ds = DefRNA.structs.first; ds; ds = ds->cont.next) {
+               srna = ds->srna;
+
                for (dp = ds->cont.properties.first; dp; dp = dp->next)
                        rna_def_property_funcs_impl_cpp(f, ds->srna, dp);
 
                fprintf(f, "\n");
+
+               for (dfunc = ds->functions.first; dfunc; dfunc = dfunc->cont.next)
+                       rna_def_struct_function_impl_cpp(f, srna, dfunc);
+
+               fprintf(f, "\n");
        }
 
        fprintf(f, "}\n\n#endif /* __RNA_BLENDER_CPP_H__ */\n\n");
@@ -3007,6 +3883,13 @@ static int rna_preprocess(const char *outfile)
                if (PROCESS_ITEMS[i].define) {
                        PROCESS_ITEMS[i].define(brna);
 
+                       /* sanity check */
+                       if (!DefRNA.animate) {
+                               fprintf(stderr,
+                                       "Error: DefRNA.animate left disabled in %s\n",
+                                       PROCESS_ITEMS[i].filename);
+                       }
+
                        for (ds = DefRNA.structs.first; ds; ds = ds->cont.next)
                                if (!ds->filename)
                                        ds->filename = PROCESS_ITEMS[i].filename;
@@ -3015,39 +3898,13 @@ static int rna_preprocess(const char *outfile)
 
        rna_auto_types();
 
-
-       /* create RNA_blender_cpp.h */
-       strcpy(deffile, outfile);
-       strcat(deffile, "RNA_blender_cpp.h" TMP_EXT);
-
        status = (DefRNA.error != 0);
 
-       if (status) {
-               make_bad_file(deffile, __LINE__);
-       }
-       else {
-               file = fopen(deffile, "w");
-
-               if (!file) {
-                       fprintf(stderr, "Unable to open file: %s\n", deffile);
-                       status = 1;
-               }
-               else {
-                       rna_generate_header_cpp(brna, file);
-                       fclose(file);
-                       status = (DefRNA.error != 0);
-               }
-       }
-
-       replace_if_different(deffile, NULL);
-
-       rna_sort(brna);
-
        /* create rna_gen_*.c files */
        for (i = 0; PROCESS_ITEMS[i].filename; i++) {
                strcpy(deffile, outfile);
                strcat(deffile, PROCESS_ITEMS[i].filename);
-               deffile[strlen(deffile)-2] = '\0';
+               deffile[strlen(deffile) - 2] = '\0';
                strcat(deffile, "_gen.c" TMP_EXT);
 
                if (status) {
@@ -3075,6 +3932,31 @@ static int rna_preprocess(const char *outfile)
                replace_if_different(deffile, deps);
        }
 
+       /* create RNA_blender_cpp.h */
+       strcpy(deffile, outfile);
+       strcat(deffile, "RNA_blender_cpp.h" TMP_EXT);
+
+       if (status) {
+               make_bad_file(deffile, __LINE__);
+       }
+       else {
+               file = fopen(deffile, "w");
+
+               if (!file) {
+                       fprintf(stderr, "Unable to open file: %s\n", deffile);
+                       status = 1;
+               }
+               else {
+                       rna_generate_header_cpp(brna, file);
+                       fclose(file);
+                       status = (DefRNA.error != 0);
+               }
+       }
+
+       replace_if_different(deffile, NULL);
+
+       rna_sort(brna);
+
        /* create RNA_blender.h */
        strcpy(deffile, outfile);
        strcat(deffile, "RNA_blender.h" TMP_EXT);
@@ -3115,12 +3997,12 @@ int main(int argc, char **argv)
 {
        int totblock, return_status = 0;
 
-       if (argc<2) {
+       if (argc < 2) {
                fprintf(stderr, "Usage: %s outdirectory/\n", argv[0]);
                return_status = 1;
        }
        else {
-               fprintf(stderr, "Running makesrna");
+               fprintf(stderr, "Running makesrna\n");
                makesrna_path = argv[0];
                return_status = rna_preprocess(argv[1]);
        }