[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [37536] branches/soc-2011-pepper/source/ blender: BGE_Animations: Removing the Fcurve Actuator as a possible actuator type, but keeping a lot of the code around as reference.

[Mitchell Stokes]

Revision: 37536
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37536
Author:   moguri
Date:     2011-06-16 02:14:01 +0000 (Thu, 16 Jun 2011)
Log Message:
-----------
BGE_Animations: Removing the Fcurve Actuator as a possible actuator type, but keeping a lot of the code around as reference.

Modified Paths:
--------------
    branches/soc-2011-pepper/source/blender/editors/space_logic/logic_window.c
    branches/soc-2011-pepper/source/blender/makesrna/intern/rna_actuator.c

Modified: branches/soc-2011-pepper/source/blender/editors/space_logic/logic_window.c
===================================================================
--- branches/soc-2011-pepper/source/blender/editors/space_logic/logic_window.c	2011-06-16 01:59:50 UTC (rev 37535)
+++ branches/soc-2011-pepper/source/blender/editors/space_logic/logic_window.c	2011-06-16 02:14:01 UTC (rev 37536)
@@ -3988,6 +3988,7 @@
 		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)
 {
 	Object *ob;
@@ -4408,9 +4409,6 @@
 		case ACT_GAME:
 			draw_actuator_game(box, ptr);
 			break;
-		case ACT_IPO:
-			draw_actuator_ipo(box, ptr);
-			break;
 		case ACT_MESSAGE:
 			draw_actuator_message(box, ptr, C);
 			break;

Modified: branches/soc-2011-pepper/source/blender/makesrna/intern/rna_actuator.c
===================================================================
--- branches/soc-2011-pepper/source/blender/makesrna/intern/rna_actuator.c	2011-06-16 01:59:50 UTC (rev 37535)
+++ branches/soc-2011-pepper/source/blender/makesrna/intern/rna_actuator.c	2011-06-16 02:14:01 UTC (rev 37536)
@@ -49,7 +49,6 @@
 	{ACT_CAMERA, "CAMERA", 0, "Camera", ""},
 	{ACT_CONSTRAINT, "CONSTRAINT", 0, "Constraint", ""},
 	{ACT_EDIT_OBJECT, "EDIT_OBJECT", 0, "Edit Object", ""},
-	{ACT_IPO, "FCURVE", 0, "F-Curve", ""},
 	{ACT_2DFILTER, "FILTER_2D", 0, "Filter 2D", ""},
 	{ACT_GAME, "GAME", 0, "Game", ""},
 	{ACT_MESSAGE, "MESSAGE", 0, "Message", ""},
@@ -77,8 +76,6 @@
 			return &RNA_ActionActuator;
 		case ACT_OBJECT:
 			return &RNA_ObjectActuator;
-		case ACT_IPO:
-			return &RNA_FCurveActuator;
 		case ACT_CAMERA:
 			return &RNA_CameraActuator;
 		case ACT_SOUND:
@@ -457,7 +454,6 @@
 	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);
-	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_GAME);
 	RNA_enum_items_add_value(&item, &totitem, actuator_type_items, ACT_MESSAGE);
@@ -866,6 +862,7 @@
 	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)
 {
 	StructRNA *srna;
@@ -2008,7 +2005,6 @@
 
 	rna_def_action_actuator(brna);
 	rna_def_object_actuator(brna);
-	rna_def_fcurve_actuator(brna);
 	rna_def_camera_actuator(brna);
 	rna_def_sound_actuator(brna);
 	rna_def_property_actuator(brna);