sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

BGE Animations: Shape Action Actuators are now converted to Action Actuators and new Shape Action Actuators cannot be created.

Browse Source
This commit is contained in:
Mitchell Stokes 2011-06-23 22:23:46 +00:00
parent f1a2d46aa0
commit 7996d04474
2 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
source/blender/blenloader/intern/readfile.c
View File

@ -11671,7 +11671,7 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
}
{
/* convert fcurve actuator to action actuator */
/* convert fcurve and shape action actuators to action actuators */
Object *ob;
bActuator *act;
bIpoActuator *ia;
@ -11701,6 +11701,9 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
act->type= act->otype= ACT_ACTION;
}
else if (act->type == ACT_SHAPEACTION) {
act->type = act->otype = ACT_ACTION;
}
}
}
}

9
source/blender/makesrna/intern/rna_actuator.c
View File

@ -57,7 +57,6 @@ EnumPropertyItem actuator_type_items[] ={
{ACT_PROPERTY, "PROPERTY", 0, "Property", ""},
{ACT_RANDOM, "RANDOM", 0, "Random", ""},
{ACT_SCENE, "SCENE", 0, "Scene", ""},
{ACT_SHAPEACTION, "SHAPE_ACTION", 0, "Shape Action", ""},
{ACT_SOUND, "SOUND", 0, "Sound", ""},
{ACT_STATE, "STATE", 0, "State", ""},
{ACT_VISIBILITY, "VISIBILITY", 0, "Visibility", ""},
@ -100,8 +99,6 @@ static StructRNA* rna_Actuator_refine(struct PointerRNA *ptr)
return &RNA_Filter2DActuator;
case ACT_PARENT:
return &RNA_ParentActuator;
case ACT_SHAPEACTION:
return &RNA_ShapeActionActuator;
case ACT_STATE:
return &RNA_StateActuator;
case ACT_ARMATURE:
@ -463,12 +460,6 @@ EnumPropertyItem *rna_Actuator_type_itemf(bContext *C, PointerRNA *ptr, Property
RNA_enum_items_add_value(&item, &totitem, actuator_type_items, ACT_RANDOM);
RNA_enum_items_add_value(&item, &totitem, actuator_type_items, ACT_SCENE);
if (ob != NULL) {
if (ob->type==OB_MESH){
RNA_enum_items_add_value(&item, &totitem, actuator_type_items, ACT_SHAPEACTION);
}
}
RNA_enum_items_add_value(&item, &totitem, actuator_type_items, ACT_SOUND);
RNA_enum_items_add_value(&item, &totitem, actuator_type_items, ACT_STATE);
RNA_enum_items_add_value(&item, &totitem, actuator_type_items, ACT_VISIBILITY);