diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2010-11-02 16:12:30 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2010-11-02 16:12:30 +0300 |
| commit | 369a5cc29e80d0ac30f9db444f2c0f9c1da32e01 (patch) | |
| tree | e6510d985b37ef027e5614da8b5479a2d95c7a92 /source/blender/makesrna | |
| parent | 5d7ed88f17c7a253c81ee48c147149d73dd88e6a (diff) | |
fix for compiling with the c90 standard, support for non-static variable initializers is a c99 feature.
Diffstat (limited to 'source/blender/makesrna')
| -rw-r--r-- | source/blender/makesrna/intern/rna_define.c | 7 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_ui_api.c | 5 |
2 files changed, 9 insertions, 3 deletions
diff --git a/source/blender/makesrna/intern/rna_define.c b/source/blender/makesrna/intern/rna_define.c index 66ef0f3b950..85f31e245d4 100644 --- a/source/blender/makesrna/intern/rna_define.c +++ b/source/blender/makesrna/intern/rna_define.c @@ -2240,8 +2240,11 @@ PropertyRNA *RNA_def_float_matrix(StructOrFunctionRNA *cont_, const char *identi { ContainerRNA *cont= cont_; PropertyRNA *prop; - int length[2]= {rows, columns}; - + int length[2]; + + length[0]= rows; + length[1]= columns; + prop= RNA_def_property(cont, identifier, PROP_FLOAT, PROP_MATRIX); RNA_def_property_multi_array(prop, 2, length); if(default_value) RNA_def_property_float_array_default(prop, default_value); diff --git a/source/blender/makesrna/intern/rna_ui_api.c b/source/blender/makesrna/intern/rna_ui_api.c index a230a51e792..dfecd016f45 100644 --- a/source/blender/makesrna/intern/rna_ui_api.c +++ b/source/blender/makesrna/intern/rna_ui_api.c @@ -65,11 +65,14 @@ static PointerRNA rna_uiItemO(uiLayout *layout, char *opname, char *name, int ic #else -#define DEF_ICON(name) {name, (#name)+5, 0, (#name)+5, ""}, +#define DEF_ICON(name) {ICON_##name, (#name), 0, (#name), ""}, +#define DEF_VICO(name) {VICO_##name, (#name), 0, (#name), ""}, + static EnumPropertyItem icon_items[] = { #include "UI_icons.h" {0, NULL, 0, NULL, NULL}}; #undef DEF_ICON +#undef DEF_VICO static void api_ui_item_common(FunctionRNA *func) { |