Merge of itasc branch. Project files, scons and cmake should be working. Makefile...
[blender.git] / source / blender / makesrna / intern / rna_actuator.c
index 3eb88e7..ce83d1c 100644 (file)
@@ -51,14 +51,14 @@ void RNA_def_actuator(BlenderRNA *brna)
                {ACT_SCENE, "SCENE", 0, "Scene", ""},
                {ACT_RANDOM, "RANDOM", 0, "Random", ""},
                {ACT_MESSAGE, "MESSAGE", 0, "Message", ""},
-               {ACT_ACTION, "ACTION", 0, "Action", ""},
-               {ACT_CD, "CD", 0, "CD", ""},
+                {ACT_ACTION, "ACTION", 0, "Action", ""},
                {ACT_GAME, "GAME", 0, "Game", ""},
                {ACT_VISIBILITY, "VISIBILITY", 0, "Visibility", ""},
                {ACT_2DFILTER, "FILTER_2D", 0, "2D Filter", ""},
                {ACT_PARENT, "PARENT", 0, "Parent", ""},
                {ACT_SHAPEACTION, "SHAPE_ACTION", 0, "Shape Action", ""},
                {ACT_STATE, "STATE", 0, "State", ""},
+               {ACT_ARMATURE, "ARMATURE", 0, "Armature", ""},
                {0, NULL, 0, NULL, NULL}};
 
        srna= RNA_def_struct(brna, "Actuator", NULL);