Merge branch 'master' into blender2.8
[blender.git] / source / blender / makesrna / intern / rna_main.c
index 3392d0d..9a245ff 100644 (file)
@@ -239,12 +239,6 @@ static void rna_Main_brush_begin(CollectionPropertyIterator *iter, PointerRNA *p
        rna_iterator_listbase_begin(iter, &bmain->brush, NULL);
 }
 
-static void rna_Main_particle_begin(CollectionPropertyIterator *iter, PointerRNA *ptr)
-{
-       Main *bmain = (Main *)ptr->data;
-       rna_iterator_listbase_begin(iter, &bmain->particle, NULL);
-}
-
 static void rna_Main_palettes_begin(CollectionPropertyIterator *iter, PointerRNA *ptr)
 {
        Main *bmain = (Main *)ptr->data;
@@ -354,7 +348,6 @@ void RNA_def_main(BlenderRNA *brna)
                {"sounds", "Sound", "rna_Main_sound_begin", "Sounds", "Sound datablocks", RNA_def_main_sounds},
                {"armatures", "Armature", "rna_Main_armature_begin", "Armatures", "Armature datablocks", RNA_def_main_armatures},
                {"actions", "Action", "rna_Main_action_begin", "Actions", "Action datablocks", RNA_def_main_actions},
-               {"particles", "ParticleSettings", "rna_Main_particle_begin", "Particles", "Particle datablocks", RNA_def_main_particles},
                {"palettes", "Palette", "rna_Main_palettes_begin", "Palettes", "Palette datablocks", RNA_def_main_palettes},
                {"grease_pencil", "GreasePencil", "rna_Main_gpencil_begin", "Grease Pencil", "Grease Pencil datablocks", RNA_def_main_gpencil},
                {"movieclips", "MovieClip", "rna_Main_movieclips_begin", "Movie Clips", "Movie Clip datablocks", RNA_def_main_movieclips},