diff options
Diffstat (limited to 'source/blender/makesrna/intern/makesrna.c')
| -rw-r--r-- | source/blender/makesrna/intern/makesrna.c | 675 |
1 files changed, 338 insertions, 337 deletions
diff --git a/source/blender/makesrna/intern/makesrna.c b/source/blender/makesrna/intern/makesrna.c index 62957ac5de8..d148182cce7 100644 --- a/source/blender/makesrna/intern/makesrna.c +++ b/source/blender/makesrna/intern/makesrna.c @@ -139,7 +139,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 +170,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); @@ -213,16 +213,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 +235,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 +261,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); @@ -322,7 +322,7 @@ static char *rna_alloc_function_name(const char *structname, const char *propnam char *result; snprintf(buffer, sizeof(buffer), "%s_%s_%s", structname, propname, type); - result = MEM_callocN(sizeof(char)*strlen(buffer)+1, "rna_alloc_function_name"); + result = MEM_callocN(sizeof(char) * strlen(buffer) + 1, "rna_alloc_function_name"); strcpy(result, buffer); alloc = MEM_callocN(sizeof(AllocDefRNA), "AllocDefRNA"); @@ -421,7 +421,7 @@ static const char *rna_parameter_type_name(PropertyRNA *parm) switch (parm->type) { case PROP_POINTER: { - PointerPropertyRNA *pparm = (PointerPropertyRNA*)parm; + PointerPropertyRNA *pparm = (PointerPropertyRNA *)parm; if (parm->flag & PROP_RNAPTR) return "PointerRNA"; @@ -438,11 +438,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 +459,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) @@ -524,7 +524,7 @@ static char *rna_def_property_get_func(FILE *f, StructRNA *srna, PropertyRNA *pr switch (prop->type) { case PROP_STRING: { - StringPropertyRNA *sprop = (StringPropertyRNA*)prop; + StringPropertyRNA *sprop = (StringPropertyRNA *)prop; fprintf(f, "void %s(PointerRNA *ptr, char *value)\n", func); fprintf(f, "{\n"); if (manualfunc) { @@ -533,10 +533,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); @@ -563,20 +563,20 @@ static char *rna_def_property_get_func(FILE *f, StructRNA *srna, PropertyRNA *pr 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; + CollectionPropertyRNA *cprop = (CollectionPropertyRNA *)prop; fprintf(f, "static PointerRNA %s(CollectionPropertyIterator *iter)\n", func); fprintf(f, "{\n"); @@ -586,7 +586,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); @@ -626,16 +626,16 @@ static char *rna_def_property_get_func(FILE *f, StructRNA *srna, PropertyRNA *pr 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); + (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); + 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"); @@ -646,11 +646,11 @@ static char *rna_def_property_get_func(FILE *f, StructRNA *srna, PropertyRNA *pr } 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); + 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); + rna_type_type(prop), (dp->booleannegative) ? "!" : "", dp->dnaname); } } fprintf(f, " }\n"); @@ -667,7 +667,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 +678,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 +693,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 +702,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,7 +714,7 @@ 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 (array) fprintf(f, "CLAMPIS(values[i], "); @@ -730,7 +730,7 @@ 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 (array) fprintf(f, "CLAMPIS(values[i], "); @@ -777,7 +777,7 @@ static char *rna_def_property_set_func(FILE *f, StructRNA *srna, PropertyRNA *pr switch (prop->type) { case PROP_STRING: { - StringPropertyRNA *sprop = (StringPropertyRNA*)prop; + StringPropertyRNA *sprop = (StringPropertyRNA *)prop; fprintf(f, "void %s(PointerRNA *ptr, const char *value)\n", func); fprintf(f, "{\n"); if (manualfunc) { @@ -786,10 +786,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); @@ -829,8 +829,8 @@ static char *rna_def_property_set_func(FILE *f, StructRNA *srna, PropertyRNA *pr 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"); @@ -876,7 +876,7 @@ static char *rna_def_property_set_func(FILE *f, StructRNA *srna, PropertyRNA *pr 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); + (dp->booleannegative) ? "!" : "", dp->dnaname, dp->booleanbit); fprintf(f, " else data->%s &= ~(%d<<i);\n", dp->dnaname, dp->booleanbit); } else { @@ -983,7 +983,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; @@ -1088,8 +1088,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 +1153,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) @@ -1267,79 +1267,79 @@ static void rna_def_property_funcs(FILE *f, StructRNA *srna, PropertyDefRNA *dp) switch (prop->type) { case PROP_BOOLEAN: { - BoolPropertyRNA *bprop = (BoolPropertyRNA*)prop; + 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; + 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; + 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; + 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; + 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; + 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); @@ -1348,28 +1348,28 @@ 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; + CollectionPropertyRNA *cprop = (CollectionPropertyRNA *)prop; + const char *nextfunc = (const char *)cprop->next; - if (dp->dnatype && strcmp(dp->dnatype, "ListBase") == 0); + 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); + 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); if (!(prop->flag & PROP_IDPROPERTY)) { if (!cprop->begin) { @@ -1405,7 +1405,7 @@ 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), ""); @@ -1443,13 +1443,13 @@ static void rna_def_property_funcs_header(FILE *f, StructRNA *srna, PropertyDefR break; } case PROP_ENUM: { - EnumPropertyRNA *eprop = (EnumPropertyRNA*)prop; + 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); @@ -1463,7 +1463,7 @@ static void rna_def_property_funcs_header(FILE *f, StructRNA *srna, PropertyDefR break; } case PROP_STRING: { - StringPropertyRNA *sprop = (StringPropertyRNA*)prop; + StringPropertyRNA *sprop = (StringPropertyRNA *)prop; if (sprop->maxlength) { fprintf(f, "#define %s_%s_MAX %d\n\n", srna->identifier, prop->identifier, sprop->maxlength); @@ -1500,7 +1500,7 @@ static void rna_def_property_funcs_header_cpp(FILE *f, StructRNA *srna, Property 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') @@ -1533,13 +1533,13 @@ static void rna_def_property_funcs_header_cpp(FILE *f, StructRNA *srna, Property break; } case PROP_ENUM: { - EnumPropertyRNA *eprop = (EnumPropertyRNA*)prop; + 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); @@ -1555,19 +1555,19 @@ static void rna_def_property_funcs_header_cpp(FILE *f, StructRNA *srna, Property break; } case PROP_POINTER: { - PointerPropertyRNA *pprop = (PointerPropertyRNA*)dp->prop; + 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; + CollectionPropertyRNA *cprop = (CollectionPropertyRNA *)dp->prop; if (cprop->item_type) - fprintf(f, "\tCOLLECTION_PROPERTY(%s, %s, %s)", (const char*)cprop->item_type, srna->identifier, + fprintf(f, "\tCOLLECTION_PROPERTY(%s, %s, %s)", (const char *)cprop->item_type, srna->identifier, rna_safe_id(prop->identifier)); else fprintf(f, "\tCOLLECTION_PROPERTY(%s, %s, %s)", "UnknownType", srna->identifier, @@ -1585,7 +1585,7 @@ static void rna_def_property_funcs_impl_cpp(FILE *f, StructRNA *srna, PropertyDe prop = dp->prop; - if (prop->flag & (PROP_IDPROPERTY|PROP_BUILTIN)) + if (prop->flag & (PROP_IDPROPERTY | PROP_BUILTIN)) return; switch (prop->type) { @@ -1624,10 +1624,10 @@ static void rna_def_property_funcs_impl_cpp(FILE *f, StructRNA *srna, PropertyDe break; } case PROP_POINTER: { - PointerPropertyRNA *pprop = (PointerPropertyRNA*)dp->prop; + 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, @@ -1636,10 +1636,10 @@ static void rna_def_property_funcs_impl_cpp(FILE *f, StructRNA *srna, PropertyDe } 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, + fprintf(f, "\tCOLLECTION_PROPERTY(%s, %s, %s)", (const char *)cprop->type, srna->identifier, prop->identifier); else fprintf(f, "\tCOLLECTION_PROPERTY(%s, %s, %s)", "UnknownType", srna->identifier, prop->identifier); @@ -1869,23 +1869,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); } } } @@ -1965,16 +1965,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"; } } @@ -2022,7 +2022,7 @@ 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"); } @@ -2082,7 +2082,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 @@ -2199,8 +2199,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,127 +2209,127 @@ 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; - fprintf(f, "\n};\n\n"); + 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"); } - 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); @@ -2355,7 +2355,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 +2365,112 @@ 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, %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; + } } fprintf(f, "};\n\n"); @@ -2501,12 +2501,12 @@ static void rna_generate_struct(BlenderRNA *brna, StructRNA *srna, FILE *f) if (func->cont.next) fprintf(f, "\t{(FunctionRNA*)&rna_%s_%s_func, ", srna->identifier, - ((FunctionRNA*)func->cont.next)->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); + ((FunctionRNA *)func->cont.prev)->identifier); else fprintf(f, "NULL,\n"); @@ -2540,9 +2540,9 @@ 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"); @@ -2679,7 +2679,8 @@ static RNAProcessItem PROCESS_ITEMS[] = { {"rna_world.c", NULL, RNA_def_world}, {"rna_movieclip.c", NULL, RNA_def_movieclip}, {"rna_tracking.c", NULL, RNA_def_tracking}, - {NULL, NULL}}; + {NULL, NULL} +}; static void rna_generate(BlenderRNA *brna, FILE *f, const char *filename, const char *api_filename) { @@ -2778,7 +2779,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"); @@ -2955,12 +2956,12 @@ static void rna_generate_header_cpp(BlenderRNA *brna, FILE *f) fprintf(f, "/**************** %s ****************/\n\n", srna->name); - fprintf(f, "class %s : public %s {\n", srna->identifier, (srna->base)? srna->base->identifier: "Pointer"); + 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"); + (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->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"); @@ -3046,7 +3047,7 @@ static int rna_preprocess(const char *outfile) 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) { @@ -3114,7 +3115,7 @@ 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; } |