Merge with trunk revision 37149.

[blender-staging.git] / source / blender / makesrna / intern / rna_actuator.c

diff --git a/source/blender/makesrna/intern/rna_actuator.c b/source/blender/makesrna/intern/rna_actuator.c
index c7cf511d5c7991f21c2f2c15e05485d5ccd72dac..e16d13fafaa57632453be25d4422e8c602102098 100644 (file)
--- a/source/blender/makesrna/intern/rna_actuator.c
+++ b/source/blender/makesrna/intern/rna_actuator.c
@@ -426,11 +426,11 @@ EnumPropertyItem *rna_Actuator_type_itemf(bContext *C, PointerRNA *ptr, Property
        
        if (ob != NULL) {
                if (ob->type==OB_ARMATURE) {
-                       RNA_enum_items_add_value(&item, &totitem, actuator_type_items, ACT_ACTION);
                        RNA_enum_items_add_value(&item, &totitem, actuator_type_items, ACT_ARMATURE);
                }
        }
-
+       
+       RNA_enum_items_add_value(&item, &totitem, actuator_type_items, ACT_ACTION);
        RNA_enum_items_add_value(&item, &totitem, actuator_type_items, ACT_CAMERA);
        RNA_enum_items_add_value(&item, &totitem, actuator_type_items, ACT_CONSTRAINT);
        RNA_enum_items_add_value(&item, &totitem, actuator_type_items, ACT_EDIT_OBJECT);