diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2010-12-16 12:51:55 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2010-12-16 12:51:55 +0300 |
| commit | ee05792a7ba189cc7b1973d10a391ac56c683138 (patch) | |
| tree | 7b2232b2c40c9fbbf31186572c529826b5f5c361 /source/blender/makesrna/intern/rna_object.c | |
| parent | 6d2019074ffb3466840443a4a75cb19ca6493566 (diff) | |
missed this file before (de-duplicating enum).
Diffstat (limited to 'source/blender/makesrna/intern/rna_object.c')
| -rw-r--r-- | source/blender/makesrna/intern/rna_object.c | 19 |
1 files changed, 3 insertions, 16 deletions
diff --git a/source/blender/makesrna/intern/rna_object.c b/source/blender/makesrna/intern/rna_object.c index 57f332a4248..5d2b2e5f178 100644 --- a/source/blender/makesrna/intern/rna_object.c +++ b/source/blender/makesrna/intern/rna_object.c @@ -92,14 +92,14 @@ EnumPropertyItem metaelem_type_items[] = { /* used for 2 enums */ #define OBTYPE_CU_CURVE {OB_CURVE, "CURVE", 0, "Curve", ""} #define OBTYPE_CU_SURF {OB_SURF, "SURFACE", 0, "Surface", ""} -#define OBTYPE_CU_TEXT {OB_FONT, "TEXT", 0, "Text", ""} +#define OBTYPE_CU_FONT {OB_FONT, "FONT", 0, "Font", ""} EnumPropertyItem object_type_items[] = { {OB_MESH, "MESH", 0, "Mesh", ""}, OBTYPE_CU_CURVE, OBTYPE_CU_SURF, {OB_MBALL, "META", 0, "Meta", ""}, - OBTYPE_CU_TEXT, + OBTYPE_CU_FONT, {0, "", 0, NULL, NULL}, {OB_ARMATURE, "ARMATURE", 0, "Armature", ""}, {OB_LATTICE, "LATTICE", 0, "Lattice", ""}, @@ -112,7 +112,7 @@ EnumPropertyItem object_type_items[] = { EnumPropertyItem object_type_curve_items[] = { OBTYPE_CU_CURVE, OBTYPE_CU_SURF, - OBTYPE_CU_TEXT, + OBTYPE_CU_FONT, {0, NULL, 0, NULL, NULL}}; @@ -1586,19 +1586,6 @@ static void rna_def_object(BlenderRNA *brna) StructRNA *srna; PropertyRNA *prop; - static EnumPropertyItem object_type_items[] = { - {OB_EMPTY, "EMPTY", 0, "Empty", ""}, - {OB_MESH, "MESH", 0, "Mesh", ""}, - {OB_CURVE, "CURVE", 0, "Curve", ""}, - {OB_SURF, "SURFACE", 0, "Surface", ""}, - {OB_FONT, "FONT", 0, "Font", ""}, - {OB_MBALL, "META", 0, "Meta", ""}, - {OB_LAMP, "LAMP", 0, "Lamp", ""}, - {OB_CAMERA, "CAMERA", 0, "Camera", ""}, - {OB_LATTICE, "LATTICE", 0, "Lattice", ""}, - {OB_ARMATURE, "ARMATURE", 0, "Armature", ""}, - {0, NULL, 0, NULL, NULL}}; - static EnumPropertyItem empty_drawtype_items[] = { {OB_ARROWS, "ARROWS", 0, "Arrows", ""}, {OB_SINGLE_ARROW, "SINGLE_ARROW", 0, "Single Arrow", ""}, |