1 files changed, 10 insertions, 33 deletions

diff --git a/source/blender/makesrna/intern/rna_actuator.c b/source/blender/makesrna/intern/rna_actuator.c
index b3800b2d68d..e9da96e0960 100644
--- a/source/blender/makesrna/intern/rna_actuator.c
+++ b/source/blender/makesrna/intern/rna_actuator.c
@@ -56,14 +56,6 @@ EnumPropertyItem actuator_type_items[] ={
 	{ACT_VISIBILITY, "VISIBILITY", 0, "Visibility", ""},
 	{0, NULL, 0, NULL, NULL}};
 
-EnumPropertyItem edit_object_type_items[] ={
-	{ACT_EDOB_ADD_OBJECT, "ADDOBJECT", 0, "Add Object", ""},
-	{ACT_EDOB_END_OBJECT, "ENDOBJECT", 0, "End Object", ""},
-	{ACT_EDOB_REPLACE_MESH, "REPLACEMESH", 0, "Replace Mesh", ""},
-	{ACT_EDOB_TRACK_TO, "TRACKTO", 0, "Track to", ""},
-	{ACT_EDOB_DYNAMICS, "DYNAMICS", 0, "Dynamics", ""},
-	{0, NULL, 0, NULL, NULL} };
-
 #ifdef RNA_RUNTIME
 
 #include "BKE_sca.h"
@@ -346,28 +338,6 @@ static void rna_StateActuator_state_set(PointerRNA *ptr, const int *values)
 	}
 }
 
-static EnumPropertyItem *rna_EditObjectActuator_mode_itemf(bContext *C, PointerRNA *ptr, int *free)
-{
-	EnumPropertyItem *item= NULL;
-	Object *ob = (Object *)ptr->id.data;
-
-	int totitem= 0;
-	if (ob->type!=OB_ARMATURE)
-	{
-		RNA_enum_items_add_value(&item, &totitem, edit_object_type_items, ACT_EDOB_REPLACE_MESH);
-		RNA_enum_items_add_value(&item, &totitem, edit_object_type_items, ACT_EDOB_DYNAMICS);
-	}
-
-	RNA_enum_items_add_value(&item, &totitem, edit_object_type_items, ACT_EDOB_ADD_OBJECT);
-	RNA_enum_items_add_value(&item, &totitem, edit_object_type_items, ACT_EDOB_END_OBJECT);
-	RNA_enum_items_add_value(&item, &totitem, edit_object_type_items, ACT_EDOB_TRACK_TO);
-	
-	RNA_enum_item_end(&item, &totitem);
-	*free= 1;
-	
-	return item;
-}
-
 /* Always keep in alphabetical order */
 EnumPropertyItem *rna_Actuator_type_itemf(bContext *C, PointerRNA *ptr, int *free)
 {
@@ -1209,14 +1179,21 @@ static void rna_def_edit_object_actuator(BlenderRNA *brna)
 		{ACT_EDOB_SET_MASS, "SETMASS", 0, "Set Mass", ""},
 		{0, NULL, 0, NULL, NULL} };
 
+	static EnumPropertyItem prop_type_items[] ={
+	{ACT_EDOB_ADD_OBJECT, "ADDOBJECT", 0, "Add Object", ""},
+	{ACT_EDOB_END_OBJECT, "ENDOBJECT", 0, "End Object", ""},
+	{ACT_EDOB_REPLACE_MESH, "REPLACEMESH", 0, "Replace Mesh", ""},
+	{ACT_EDOB_TRACK_TO, "TRACKTO", 0, "Track to", ""},
+	{ACT_EDOB_DYNAMICS, "DYNAMICS", 0, "Dynamics", ""},
+	{0, NULL, 0, NULL, NULL} };
+
 	srna= RNA_def_struct(brna, "EditObjectActuator", "Actuator");
 	RNA_def_struct_ui_text(srna, "Edit Object Actuator", "Actuator used to edit objects");
 	RNA_def_struct_sdna_from(srna, "bEditObjectActuator", "data");
 
 	prop= RNA_def_property(srna, "mode", PROP_ENUM, PROP_NONE);
 	RNA_def_property_enum_sdna(prop, NULL, "type");
-	RNA_def_property_enum_items(prop, edit_object_type_items);
-	RNA_def_property_enum_funcs(prop, NULL, NULL, "rna_EditObjectActuator_mode_itemf");
+	RNA_def_property_enum_items(prop, prop_type_items);
 	RNA_def_property_ui_text(prop, "Edit Object", "The mode of the actuator");
 	RNA_def_property_update(prop, NC_LOGIC, NULL);
 
@@ -1834,7 +1811,7 @@ static void rna_def_armature_actuator(BlenderRNA *brna)
 	RNA_def_property_ui_text(prop, "Secondary Target", "Set weight of this constraint");
 	RNA_def_property_update(prop, NC_LOGIC, NULL);
 
-	prop= RNA_def_property(srna, "weight", PROP_FLOAT, PROP_PERCENTAGE);
+	prop= RNA_def_property(srna, "weight", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "weight");
 	RNA_def_property_range(prop, 0.0, 1.0);
 	RNA_def_property_ui_text(prop, "Weight", "Set weight of this constraint");