archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

BGE_Animations: Removing the Fcurve Actuator as a possible actuator type, but keeping a lot of the code around as reference.

Browse Source
This commit is contained in:
Mitchell Stokes
2011-06-16 02:14:01 +00:00
parent 65af1dcecd
commit 4ef1e67ce8
2 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/editors/space_logic/logic_window.c
View File

@@ -3988,6 +3988,7 @@ static void draw_actuator_game(uiLayout *layout, PointerRNA *ptr)
uiItemR(layout, ptr, "filename", 0, NULL, ICON_NONE); uiItemR(layout, ptr, "filename", 0, NULL, ICON_NONE);
} }
/* The IPO/Fcurve actuator has been deprecated, so this is no longer used */
static void draw_actuator_ipo(uiLayout *layout, PointerRNA *ptr) static void draw_actuator_ipo(uiLayout *layout, PointerRNA *ptr)
{ {
Object *ob; Object *ob;
@@ -4408,9 +4409,6 @@ static void draw_brick_actuator(uiLayout *layout, PointerRNA *ptr, bContext *C)
case ACT_GAME: case ACT_GAME:
draw_actuator_game(box, ptr); draw_actuator_game(box, ptr);
break; break;
case ACT_IPO:
draw_actuator_ipo(box, ptr);
break;
case ACT_MESSAGE: case ACT_MESSAGE:
draw_actuator_message(box, ptr, C); draw_actuator_message(box, ptr, C);
break; break;

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

@@ -49,7 +49,6 @@ EnumPropertyItem actuator_type_items[] ={
{ACT_CAMERA, "CAMERA", 0, "Camera", ""}, {ACT_CAMERA, "CAMERA", 0, "Camera", ""},
{ACT_CONSTRAINT, "CONSTRAINT", 0, "Constraint", ""}, {ACT_CONSTRAINT, "CONSTRAINT", 0, "Constraint", ""},
{ACT_EDIT_OBJECT, "EDIT_OBJECT", 0, "Edit Object", ""}, {ACT_EDIT_OBJECT, "EDIT_OBJECT", 0, "Edit Object", ""},
{ACT_IPO, "FCURVE", 0, "F-Curve", ""},
{ACT_2DFILTER, "FILTER_2D", 0, "Filter 2D", ""}, {ACT_2DFILTER, "FILTER_2D", 0, "Filter 2D", ""},
{ACT_GAME, "GAME", 0, "Game", ""}, {ACT_GAME, "GAME", 0, "Game", ""},
{ACT_MESSAGE, "MESSAGE", 0, "Message", ""}, {ACT_MESSAGE, "MESSAGE", 0, "Message", ""},
@@ -77,8 +76,6 @@ static StructRNA* rna_Actuator_refine(struct PointerRNA *ptr)
return &RNA_ActionActuator; return &RNA_ActionActuator;
case ACT_OBJECT: case ACT_OBJECT:
return &RNA_ObjectActuator; return &RNA_ObjectActuator;
case ACT_IPO:
return &RNA_FCurveActuator;
case ACT_CAMERA: case ACT_CAMERA:
return &RNA_CameraActuator; return &RNA_CameraActuator;
case ACT_SOUND: case ACT_SOUND:
@@ -457,7 +454,6 @@ EnumPropertyItem *rna_Actuator_type_itemf(bContext *C, PointerRNA *ptr, Property
RNA_enum_items_add_value(&item, &totitem, actuator_type_items, ACT_CAMERA); 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_CONSTRAINT);
RNA_enum_items_add_value(&item, &totitem, actuator_type_items, ACT_EDIT_OBJECT); RNA_enum_items_add_value(&item, &totitem, actuator_type_items, ACT_EDIT_OBJECT);
RNA_enum_items_add_value(&item, &totitem, actuator_type_items, ACT_IPO);
RNA_enum_items_add_value(&item, &totitem, actuator_type_items, ACT_2DFILTER); RNA_enum_items_add_value(&item, &totitem, actuator_type_items, ACT_2DFILTER);
RNA_enum_items_add_value(&item, &totitem, actuator_type_items, ACT_GAME); RNA_enum_items_add_value(&item, &totitem, actuator_type_items, ACT_GAME);
RNA_enum_items_add_value(&item, &totitem, actuator_type_items, ACT_MESSAGE); RNA_enum_items_add_value(&item, &totitem, actuator_type_items, ACT_MESSAGE);
@@ -866,6 +862,7 @@ static void rna_def_object_actuator(BlenderRNA *brna)
RNA_def_property_update(prop, NC_LOGIC, NULL); RNA_def_property_update(prop, NC_LOGIC, NULL);
} }
/* The fcurve actuator has been replace with the action actuator, so this is no longer used */
static void rna_def_fcurve_actuator(BlenderRNA *brna) static void rna_def_fcurve_actuator(BlenderRNA *brna)
{ {
StructRNA *srna; StructRNA *srna;
@@ -2008,7 +2005,6 @@ void RNA_def_actuator(BlenderRNA *brna)
rna_def_action_actuator(brna); rna_def_action_actuator(brna);
rna_def_object_actuator(brna); rna_def_object_actuator(brna);
rna_def_fcurve_actuator(brna);
rna_def_camera_actuator(brna); rna_def_camera_actuator(brna);
rna_def_sound_actuator(brna); rna_def_sound_actuator(brna);
rna_def_property_actuator(brna); rna_def_property_actuator(brna);