[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [37772] branches/soc-2011-pepper/source/ blender: BGE Animations: Shape Action Actuators are now converted to Action Actuators and new Shape Action Actuators cannot be created .

[Mitchell Stokes]

Revision: 37772
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37772
Author:   moguri
Date:     2011-06-23 22:23:46 +0000 (Thu, 23 Jun 2011)
Log Message:
-----------
BGE Animations: Shape Action Actuators are now converted to Action Actuators and new Shape Action Actuators cannot be created.

Modified Paths:
--------------
    branches/soc-2011-pepper/source/blender/blenloader/intern/readfile.c
    branches/soc-2011-pepper/source/blender/makesrna/intern/rna_actuator.c

Modified: branches/soc-2011-pepper/source/blender/blenloader/intern/readfile.c
===================================================================
--- branches/soc-2011-pepper/source/blender/blenloader/intern/readfile.c	2011-06-23 22:16:26 UTC (rev 37771)
+++ branches/soc-2011-pepper/source/blender/blenloader/intern/readfile.c	2011-06-23 22:23:46 UTC (rev 37772)
@@ -11671,7 +11671,7 @@
 		}
 		
 		{
-			/* 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 @@
 						act->type= act->otype= ACT_ACTION;
 						
 					}
+					else if (act->type == ACT_SHAPEACTION)  {
+						act->type = act->otype = ACT_ACTION;
+					}
 				}
 			}
 		}

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-23 22:16:26 UTC (rev 37771)
+++ branches/soc-2011-pepper/source/blender/makesrna/intern/rna_actuator.c	2011-06-23 22:23:46 UTC (rev 37772)
@@ -57,7 +57,6 @@
 	{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 @@
 			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 @@
 	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);