diff options
| author | Mitchell Stokes <mogurijin@gmail.com> | 2011-06-01 10:43:10 +0400 |
|---|---|---|
| committer | Mitchell Stokes <mogurijin@gmail.com> | 2011-06-01 10:43:10 +0400 |
| commit | 6394261e54215d50b1e39e8ea45dcb63080f193e (patch) | |
| tree | c6613ac12a741de3650cdcf3ea955cfae706d030 /source/blender/makesrna/intern/rna_actuator.c | |
| parent | 23888be4238f992e5f57638b953b01b778975e8f (diff) | |
BGE Animations: Removing guards that prevent the action actuator from being used on non-armatures. Object animation works through this actuator now too. :)
Diffstat (limited to 'source/blender/makesrna/intern/rna_actuator.c')
| -rw-r--r-- | source/blender/makesrna/intern/rna_actuator.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/makesrna/intern/rna_actuator.c b/source/blender/makesrna/intern/rna_actuator.c index 116f5185980..410822cecf8 100644 --- 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); |