Cleanup: use plural names for Main lists

Convention was not to but after discussion on 918941483f7e we agree its
best to change the convention.

Names now mostly follow RNA.

Some exceptions:

- Use 'nodetrees' instead of 'nodegroups'
  since the struct is called NodeTree.
- Use 'gpencils' instead of 'grease_pencil'
  since 'gpencil' is a common abbreviation in the C code.

Other exceptions:

- Leave 'wm' as it's a list of one.
- Leave 'ipo' as is for versioning.

1 files changed, 34 insertions, 34 deletions

diff --git a/source/blender/makesrna/intern/rna_main_api.c b/source/blender/makesrna/intern/rna_main_api.c
index 5675e00586c..34e759325d1 100644
--- a/source/blender/makesrna/intern/rna_main_api.c
+++ b/source/blender/makesrna/intern/rna_main_api.c
@@ -611,41 +611,41 @@ static LightProbe *rna_Main_lightprobe_new(Main *bmain, const char *name)
 		BKE_main_id_tag_listbase(&bmain->_listbase_name, LIB_TAG_DOIT, value);     \
 	}                                                                              \
 
-RNA_MAIN_ID_TAG_FUNCS_DEF(cameras, camera, ID_CA)
-RNA_MAIN_ID_TAG_FUNCS_DEF(scenes, scene, ID_SCE)
-RNA_MAIN_ID_TAG_FUNCS_DEF(objects, object, ID_OB)
-RNA_MAIN_ID_TAG_FUNCS_DEF(materials, mat, ID_MA)
-RNA_MAIN_ID_TAG_FUNCS_DEF(node_groups, nodetree, ID_NT)
-RNA_MAIN_ID_TAG_FUNCS_DEF(meshes, mesh, ID_ME)
-RNA_MAIN_ID_TAG_FUNCS_DEF(lights, light, ID_LA)
-RNA_MAIN_ID_TAG_FUNCS_DEF(libraries, library, ID_LI)
-RNA_MAIN_ID_TAG_FUNCS_DEF(screens, screen, ID_SCR)
+RNA_MAIN_ID_TAG_FUNCS_DEF(cameras, cameras, ID_CA)
+RNA_MAIN_ID_TAG_FUNCS_DEF(scenes, scenes, ID_SCE)
+RNA_MAIN_ID_TAG_FUNCS_DEF(objects, objects, ID_OB)
+RNA_MAIN_ID_TAG_FUNCS_DEF(materials, materials, ID_MA)
+RNA_MAIN_ID_TAG_FUNCS_DEF(node_groups, nodetrees, ID_NT)
+RNA_MAIN_ID_TAG_FUNCS_DEF(meshes, meshes, ID_ME)
+RNA_MAIN_ID_TAG_FUNCS_DEF(lights, lights, ID_LA)
+RNA_MAIN_ID_TAG_FUNCS_DEF(libraries, libraries, ID_LI)
+RNA_MAIN_ID_TAG_FUNCS_DEF(screens, screens, ID_SCR)
 RNA_MAIN_ID_TAG_FUNCS_DEF(window_managers, wm, ID_WM)
-RNA_MAIN_ID_TAG_FUNCS_DEF(images, image, ID_IM)
-RNA_MAIN_ID_TAG_FUNCS_DEF(lattices, lattice, ID_LT)
-RNA_MAIN_ID_TAG_FUNCS_DEF(curves, curve, ID_CU)
-RNA_MAIN_ID_TAG_FUNCS_DEF(metaballs, mball, ID_MB)
-RNA_MAIN_ID_TAG_FUNCS_DEF(fonts, vfont, ID_VF)
-RNA_MAIN_ID_TAG_FUNCS_DEF(textures, tex, ID_TE)
-RNA_MAIN_ID_TAG_FUNCS_DEF(brushes, brush, ID_BR)
-RNA_MAIN_ID_TAG_FUNCS_DEF(worlds, world, ID_WO)
-RNA_MAIN_ID_TAG_FUNCS_DEF(collections, collection, ID_GR)
+RNA_MAIN_ID_TAG_FUNCS_DEF(images, images, ID_IM)
+RNA_MAIN_ID_TAG_FUNCS_DEF(lattices, lattices, ID_LT)
+RNA_MAIN_ID_TAG_FUNCS_DEF(curves, curves, ID_CU)
+RNA_MAIN_ID_TAG_FUNCS_DEF(metaballs, metaballs, ID_MB)
+RNA_MAIN_ID_TAG_FUNCS_DEF(fonts, fonts, ID_VF)
+RNA_MAIN_ID_TAG_FUNCS_DEF(textures, textures, ID_TE)
+RNA_MAIN_ID_TAG_FUNCS_DEF(brushes, brushes, ID_BR)
+RNA_MAIN_ID_TAG_FUNCS_DEF(worlds, worlds, ID_WO)
+RNA_MAIN_ID_TAG_FUNCS_DEF(collections, collections, ID_GR)
 //RNA_MAIN_ID_TAG_FUNCS_DEF(shape_keys, key, ID_KE)
-RNA_MAIN_ID_TAG_FUNCS_DEF(texts, text, ID_TXT)
-RNA_MAIN_ID_TAG_FUNCS_DEF(speakers, speaker, ID_SPK)
-RNA_MAIN_ID_TAG_FUNCS_DEF(sounds, sound, ID_SO)
-RNA_MAIN_ID_TAG_FUNCS_DEF(armatures, armature, ID_AR)
-RNA_MAIN_ID_TAG_FUNCS_DEF(actions, action, ID_AC)
-RNA_MAIN_ID_TAG_FUNCS_DEF(particles, particle, ID_PA)
-RNA_MAIN_ID_TAG_FUNCS_DEF(palettes, palette, ID_PAL)
-RNA_MAIN_ID_TAG_FUNCS_DEF(gpencil, gpencil, ID_GD)
-RNA_MAIN_ID_TAG_FUNCS_DEF(movieclips, movieclip, ID_MC)
-RNA_MAIN_ID_TAG_FUNCS_DEF(masks, mask, ID_MSK)
-RNA_MAIN_ID_TAG_FUNCS_DEF(linestyle, linestyle, ID_LS)
-RNA_MAIN_ID_TAG_FUNCS_DEF(cachefiles, cachefile, ID_CF)
-RNA_MAIN_ID_TAG_FUNCS_DEF(paintcurves, paintcurve, ID_PC)
-RNA_MAIN_ID_TAG_FUNCS_DEF(workspaces, workspace, ID_WS)
-RNA_MAIN_ID_TAG_FUNCS_DEF(lightprobes, lightprobe, ID_LP)
+RNA_MAIN_ID_TAG_FUNCS_DEF(texts, texts, ID_TXT)
+RNA_MAIN_ID_TAG_FUNCS_DEF(speakers, speakers, ID_SPK)
+RNA_MAIN_ID_TAG_FUNCS_DEF(sounds, sounds, ID_SO)
+RNA_MAIN_ID_TAG_FUNCS_DEF(armatures, armatures, ID_AR)
+RNA_MAIN_ID_TAG_FUNCS_DEF(actions, actions, ID_AC)
+RNA_MAIN_ID_TAG_FUNCS_DEF(particles, particles, ID_PA)
+RNA_MAIN_ID_TAG_FUNCS_DEF(palettes, palettes, ID_PAL)
+RNA_MAIN_ID_TAG_FUNCS_DEF(gpencils, gpencils, ID_GD)
+RNA_MAIN_ID_TAG_FUNCS_DEF(movieclips, movieclips, ID_MC)
+RNA_MAIN_ID_TAG_FUNCS_DEF(masks, masks, ID_MSK)
+RNA_MAIN_ID_TAG_FUNCS_DEF(linestyle, linestyles, ID_LS)
+RNA_MAIN_ID_TAG_FUNCS_DEF(cachefiles, cachefiles, ID_CF)
+RNA_MAIN_ID_TAG_FUNCS_DEF(paintcurves, paintcurves, ID_PC)
+RNA_MAIN_ID_TAG_FUNCS_DEF(workspaces, workspaces, ID_WS)
+RNA_MAIN_ID_TAG_FUNCS_DEF(lightprobes, lightprobes, ID_LP)
 
 #undef RNA_MAIN_ID_TAG_FUNCS_DEF
 
@@ -1661,7 +1661,7 @@ void RNA_def_main_gpencil(BlenderRNA *brna, PropertyRNA *cprop)
 	RNA_def_struct_sdna(srna, "Main");
 	RNA_def_struct_ui_text(srna, "Main Grease Pencils", "Collection of grease pencils");
 
-	func = RNA_def_function(srna, "tag", "rna_Main_gpencil_tag");
+	func = RNA_def_function(srna, "tag", "rna_Main_gpencils_tag");
 	parm = RNA_def_boolean(func, "value", 0, "Value", "");
 	RNA_def_parameter_flags(parm, 0, PARM_REQUIRED);