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, 7 insertions, 7 deletions

diff --git a/source/blender/blenkernel/intern/node.c b/source/blender/blenkernel/intern/node.c
index 4eb8fa26b1e..09b44db02e5 100644
--- a/source/blender/blenkernel/intern/node.c
+++ b/source/blender/blenkernel/intern/node.c
@@ -3692,13 +3692,13 @@ void free_nodesystem(void)
 
 void BKE_node_tree_iter_init(struct NodeTreeIterStore *ntreeiter, struct Main *bmain)
 {
-	ntreeiter->ngroup = bmain->nodetree.first;
-	ntreeiter->scene = bmain->scene.first;
-	ntreeiter->mat = bmain->mat.first;
-	ntreeiter->tex = bmain->tex.first;
-	ntreeiter->light = bmain->light.first;
-	ntreeiter->world = bmain->world.first;
-	ntreeiter->linestyle = bmain->linestyle.first;
+	ntreeiter->ngroup = bmain->nodetrees.first;
+	ntreeiter->scene = bmain->scenes.first;
+	ntreeiter->mat = bmain->materials.first;
+	ntreeiter->tex = bmain->textures.first;
+	ntreeiter->light = bmain->lights.first;
+	ntreeiter->world = bmain->worlds.first;
+	ntreeiter->linestyle = bmain->linestyles.first;
 }
 bool BKE_node_tree_iter_step(struct NodeTreeIterStore *ntreeiter,
                              bNodeTree **r_nodetree, struct ID **r_id)