svn merge -r39781:39792 https://svn.blender.org/svnroot/bf-blender/trunk/blender...
[blender-staging.git] / source / blender / makesrna / intern / rna_object.c
index ddf06c79d6b254437f388bef1d0ab329afa853f3..87d73d1665105ad7051a5ad3deb0e320c3064003 100644 (file)
@@ -116,6 +116,7 @@ EnumPropertyItem object_type_items[] = {
        {0, "", 0, NULL, NULL},
        {OB_CAMERA, "CAMERA", 0, "Camera", ""},
        {OB_LAMP, "LAMP", 0, "Lamp", ""},
+       {OB_SPEAKER, "SPEAKER", 0, "Speaker", ""},
        {0, NULL, 0, NULL, NULL}};
 
 EnumPropertyItem object_type_curve_items[] = {
@@ -366,6 +367,7 @@ static StructRNA *rna_Object_data_typef(PointerRNA *ptr)
                case OB_CAMERA: return &RNA_Camera;
                case OB_LATTICE: return &RNA_Lattice;
                case OB_ARMATURE: return &RNA_Armature;
+               case OB_SPEAKER: return &RNA_Speaker;
                default: return &RNA_ID;
        }
 }