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

diff --git a/source/blender/blenkernel/intern/object_dupli.c b/source/blender/blenkernel/intern/object_dupli.c
index 5bd91c2c4ac..1f3680eb850 100644
--- a/source/blender/blenkernel/intern/object_dupli.c
+++ b/source/blender/blenkernel/intern/object_dupli.c
@@ -233,7 +233,7 @@ static void make_child_duplis(const DupliContext *ctx, void *userdata, MakeChild
 				DupliContext pctx;
 				copy_dupli_context(&pctx, ctx, ctx->object, NULL, _base_id);
 
-				/* mballs have a different dupli handling */
+				/* metaballs have a different dupli handling */
 				if (ob->type != OB_MBALL) {
 					ob->flag |= OB_DONE;  /* doesn't render */
 				}
@@ -251,7 +251,7 @@ static void make_child_duplis(const DupliContext *ctx, void *userdata, MakeChild
 				DupliContext pctx;
 				copy_dupli_context(&pctx, ctx, ctx->object, NULL, baseid);
 
-				/* mballs have a different dupli handling */
+				/* metaballs have a different dupli handling */
 				if (ob->type != OB_MBALL)
 					ob->flag |= OB_DONE;  /* doesn't render */
 
@@ -445,7 +445,7 @@ static Object *find_family_object(Main *bmain, const char *family, size_t family
 		ch_utf8[ch_utf8_len] = '\0';
 		ch_utf8_len += 1;  /* compare with null terminator */
 
-		for (ob = bmain->object.first; ob; ob = ob->id.next) {
+		for (ob = bmain->objects.first; ob; ob = ob->id.next) {
 			if (STREQLEN(ob->id.name + 2 + family_len, ch_utf8, ch_utf8_len)) {
 				if (STREQLEN(ob->id.name + 2, family, family_len)) {
 					break;