Merging trunk up to r38932.
[blender.git] / source / blender / makesrna / intern / rna_ID.c
index 8d57403..82217cd 100644 (file)
@@ -67,6 +67,7 @@ EnumPropertyItem id_type_items[] = {
        {ID_PA, "PARTICLE", ICON_PARTICLE_DATA, "Particle", ""},
        {ID_SCE, "SCENE", ICON_SCENE_DATA, "Scene", ""},
        {ID_SCR, "SCREEN", ICON_SPLITSCREEN, "Screen", ""},
+       {ID_SPK, "SPEAKER", ICON_SPEAKER, "Speaker", ""},
        {ID_SO, "SOUND", ICON_PLAY_AUDIO, "Sound", ""},
        {ID_TXT, "TEXT", ICON_TEXT, "Text", ""},
        {ID_TE, "TEXTURE", ICON_TEXTURE_DATA, "Texture", ""},
@@ -137,6 +138,7 @@ short RNA_type_to_ID_code(StructRNA *type)
        if(RNA_struct_is_a(type, &RNA_ParticleSettings)) return ID_PA;
        if(RNA_struct_is_a(type, &RNA_Scene)) return ID_SCE;
        if(RNA_struct_is_a(type, &RNA_Screen)) return ID_SCR;
+       if(RNA_struct_is_a(type, &RNA_Speaker)) return ID_SPK;
        if(RNA_struct_is_a(type, &RNA_Sound)) return ID_SO;
        if(RNA_struct_is_a(type, &RNA_Text)) return ID_TXT;
        if(RNA_struct_is_a(type, &RNA_Texture)) return ID_TE;
@@ -170,6 +172,7 @@ StructRNA *ID_code_to_RNA_type(short idcode)
                case ID_PA: return &RNA_ParticleSettings;
                case ID_SCE: return &RNA_Scene;
                case ID_SCR: return &RNA_Screen;
+               case ID_SPK: return &RNA_Speaker;
                case ID_SO: return &RNA_Sound;
                case ID_TXT: return &RNA_Text;
                case ID_TE: return &RNA_Texture;