Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2012-10-05 19:48:39 +0400
committerCampbell Barton <ideasman42@gmail.com>2012-10-05 19:48:39 +0400
commit657fc4f4742bf7b01d613ac8a5989eddadc151a4 (patch)
tree355508c5c33817435172cac961859c4155c7c8a8 /source/blender/editors/object/object_add.c
parentdb70bfc206538a9582e17a3eedcd1923e3f8d2c8 (diff)
code cleanup: de-duplicate enum.
Diffstat (limited to 'source/blender/editors/object/object_add.c')
-rw-r--r--source/blender/editors/object/object_add.c15
1 files changed, 1 insertions, 14 deletions
diff --git a/source/blender/editors/object/object_add.c b/source/blender/editors/object/object_add.c
index f6a7a6d6f17..43a32cd662e 100644
--- a/source/blender/editors/object/object_add.c
+++ b/source/blender/editors/object/object_add.c
@@ -139,19 +139,6 @@ static EnumPropertyItem field_type_items[] = {
{0, NULL, 0, NULL, NULL}
};
-/* Copy from rna_object.c */
-static EnumPropertyItem empty_drawtype_items[] = {
- {OB_PLAINAXES, "PLAIN_AXES", 0, "Plain Axes", ""},
- {OB_ARROWS, "ARROWS", 0, "Arrows", ""},
- {OB_SINGLE_ARROW, "SINGLE_ARROW", 0, "Single Arrow", ""},
- {OB_CIRCLE, "CIRCLE", 0, "Circle", ""},
- {OB_CUBE, "CUBE", 0, "Cube", ""},
- {OB_EMPTY_SPHERE, "SPHERE", 0, "Sphere", ""},
- {OB_EMPTY_CONE, "CONE", 0, "Cone", ""},
- {OB_EMPTY_IMAGE, "IMAGE", 0, "Image", ""},
- {0, NULL, 0, NULL, NULL}
-};
-
/************************** Exported *****************************/
void ED_object_location_from_view(bContext *C, float loc[3])
@@ -731,7 +718,7 @@ void OBJECT_OT_empty_add(wmOperatorType *ot)
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
/* properties */
- ot->prop = RNA_def_enum(ot->srna, "type", empty_drawtype_items, 0, "Type", "");
+ ot->prop = RNA_def_enum(ot->srna, "type", object_empty_drawtype_items, 0, "Type", "");
ED_object_add_generic_props(ot, FALSE);
}