Merge branch 'master' into blender2.8

Conflicts:
	source/blender/blenkernel/intern/blendfile.c
	source/blender/blenloader/intern/readfile.h
	source/blender/blenloader/intern/versioning_250.c
	source/blender/blenloader/intern/versioning_260.c
	source/blender/blenloader/intern/versioning_270.c
	source/blender/blenloader/intern/versioning_legacy.c
	source/blender/editors/render/render_shading.c
	source/blender/makesrna/intern/rna_movieclip.c
	source/blender/render/intern/source/pipeline.c
	source/blender/render/intern/source/voxeldata.c

1 files changed, 135 insertions, 135 deletions

diff --git a/source/blender/blenloader/intern/versioning_270.c b/source/blender/blenloader/intern/versioning_270.c
index ee589e511c6..ba714405cc0 100644
--- a/source/blender/blenloader/intern/versioning_270.c
+++ b/source/blender/blenloader/intern/versioning_270.c
@@ -346,14 +346,14 @@ static void do_version_bbone_easing_fcurve_fix(ID *UNUSED(id), FCurve *fcu, void
 }
 
 
-void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *main)
+void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *bmain)
 {
-	if (!MAIN_VERSION_ATLEAST(main, 270, 0)) {
+	if (!MAIN_VERSION_ATLEAST(bmain, 270, 0)) {
 
 		if (!DNA_struct_elem_find(fd->filesdna, "BevelModifierData", "float", "profile")) {
 			Object *ob;
 
-			for (ob = main->object.first; ob; ob = ob->id.next) {
+			for (ob = bmain->object.first; ob; ob = ob->id.next) {
 				ModifierData *md;
 				for (md = ob->modifiers.first; md; md = md->next) {
 					if (md->type == eModifierType_Bevel) {
@@ -366,7 +366,7 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *main)
 		}
 
 		/* nodes don't use fixed node->id any more, clean up */
-		FOREACH_NODETREE(main, ntree, id) {
+		FOREACH_NODETREE(bmain, ntree, id) {
 			if (ntree->type == NTREE_COMPOSIT) {
 				bNode *node;
 				for (node = ntree->nodes.first; node; node = node->next) {
@@ -380,7 +380,7 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *main)
 		{
 			bScreen *screen;
 
-			for (screen = main->screen.first; screen; screen = screen->id.next) {
+			for (screen = bmain->screen.first; screen; screen = screen->id.next) {
 				ScrArea *area;
 				for (area = screen->areabase.first; area; area = area->next) {
 					SpaceLink *space_link;
@@ -398,17 +398,17 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *main)
 
 		if (!DNA_struct_elem_find(fd->filesdna, "MovieTrackingSettings", "float", "default_weight")) {
 			MovieClip *clip;
-			for (clip = main->movieclip.first; clip; clip = clip->id.next) {
+			for (clip = bmain->movieclip.first; clip; clip = clip->id.next) {
 				clip->tracking.settings.default_weight = 1.0f;
 			}
 		}
 	}
 
-	if (!MAIN_VERSION_ATLEAST(main, 270, 1)) {
+	if (!MAIN_VERSION_ATLEAST(bmain, 270, 1)) {
 		Object *ob;
 
 		/* Update Transform constraint (another deg -> rad stuff). */
-		for (ob = main->object.first; ob; ob = ob->id.next) {
+		for (ob = bmain->object.first; ob; ob = ob->id.next) {
 			do_version_constraints_radians_degrees_270_1(&ob->constraints);
 
 			if (ob->pose) {
@@ -421,32 +421,32 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *main)
 		}
 	}
 
-	if (!MAIN_VERSION_ATLEAST(main, 270, 2)) {
+	if (!MAIN_VERSION_ATLEAST(bmain, 270, 2)) {
 		Mesh *me;
 
 		/* Mesh smoothresh deg->rad. */
-		for (me = main->mesh.first; me; me = me->id.next) {
+		for (me = bmain->mesh.first; me; me = me->id.next) {
 			me->smoothresh = DEG2RADF(me->smoothresh);
 		}
 	}
 
-	if (!MAIN_VERSION_ATLEAST(main, 270, 3)) {
+	if (!MAIN_VERSION_ATLEAST(bmain, 270, 3)) {
 		FreestyleLineStyle *linestyle;
 
-		for (linestyle = main->linestyle.first; linestyle; linestyle = linestyle->id.next) {
+		for (linestyle = bmain->linestyle.first; linestyle; linestyle = linestyle->id.next) {
 			linestyle->flag |= LS_NO_SORTING;
 			linestyle->sort_key = LS_SORT_KEY_DISTANCE_FROM_CAMERA;
 			linestyle->integration_type = LS_INTEGRATION_MEAN;
 		}
 	}
 
-	if (!MAIN_VERSION_ATLEAST(main, 270, 4)) {
+	if (!MAIN_VERSION_ATLEAST(bmain, 270, 4)) {
 		/* ui_previews were not handled correctly when copying areas, leading to corrupted files (see T39847).
 		 * This will always reset situation to a valid state.
 		 */
 		bScreen *sc;
 
-		for (sc = main->screen.first; sc; sc = sc->id.next) {
+		for (sc = bmain->screen.first; sc; sc = sc->id.next) {
 			ScrArea *sa;
 			for (sa = sc->areabase.first; sa; sa = sa->next) {
 				SpaceLink *sl;
@@ -463,11 +463,11 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *main)
 		}
 	}
 
-	if (!MAIN_VERSION_ATLEAST(main, 270, 5)) {
+	if (!MAIN_VERSION_ATLEAST(bmain, 270, 5)) {
 		Object *ob;
 
 		/* Update Transform constraint (again :|). */
-		for (ob = main->object.first; ob; ob = ob->id.next) {
+		for (ob = bmain->object.first; ob; ob = ob->id.next) {
 			do_version_constraints_radians_degrees_270_5(&ob->constraints);
 
 			if (ob->pose) {
@@ -480,11 +480,11 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *main)
 		}
 	}
 
-	if (!MAIN_VERSION_ATLEAST(main, 271, 0)) {
+	if (!MAIN_VERSION_ATLEAST(bmain, 271, 0)) {
 		if (!DNA_struct_elem_find(fd->filesdna, "RenderData", "BakeData", "bake")) {
 			Scene *sce;
 
-			for (sce = main->scene.first; sce; sce = sce->id.next) {
+			for (sce = bmain->scene.first; sce; sce = sce->id.next) {
 				sce->r.bake.flag = R_BAKE_CLEAR;
 				sce->r.bake.width = 512;
 				sce->r.bake.height = 512;
@@ -506,7 +506,7 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *main)
 		if (!DNA_struct_elem_find(fd->filesdna, "FreestyleLineStyle", "float", "texstep")) {
 			FreestyleLineStyle *linestyle;
 
-			for (linestyle = main->linestyle.first; linestyle; linestyle = linestyle->id.next) {
+			for (linestyle = bmain->linestyle.first; linestyle; linestyle = linestyle->id.next) {
 				linestyle->flag |= LS_TEXTURE;
 				linestyle->texstep = 1.0;
 			}
@@ -514,18 +514,18 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *main)
 
 		{
 			Scene *scene;
-			for (scene = main->scene.first; scene; scene = scene->id.next) {
+			for (scene = bmain->scene.first; scene; scene = scene->id.next) {
 				int num_layers = BLI_listbase_count(&scene->r.layers);
 				scene->r.actlay = min_ff(scene->r.actlay, num_layers - 1);
 			}
 		}
 	}
 
-	if (!MAIN_VERSION_ATLEAST(main, 271, 1)) {
+	if (!MAIN_VERSION_ATLEAST(bmain, 271, 1)) {
 		if (!DNA_struct_elem_find(fd->filesdna, "Material", "float", "line_col[4]")) {
 			Material *mat;
 
-			for (mat = main->mat.first; mat; mat = mat->id.next) {
+			for (mat = bmain->mat.first; mat; mat = mat->id.next) {
 				mat->line_col[0] = mat->line_col[1] = mat->line_col[2] = 0.0f;
 				mat->line_col[3] = mat->alpha;
 			}
@@ -533,22 +533,22 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *main)
 
 		if (!DNA_struct_elem_find(fd->filesdna, "RenderData", "int", "preview_start_resolution")) {
 			Scene *scene;
-			for (scene = main->scene.first; scene; scene = scene->id.next) {
+			for (scene = bmain->scene.first; scene; scene = scene->id.next) {
 				scene->r.preview_start_resolution = 64;
 			}
 		}
 	}
 
-	if (!MAIN_VERSION_ATLEAST(main, 271, 3)) {
+	if (!MAIN_VERSION_ATLEAST(bmain, 271, 3)) {
 		Brush *br;
 
-		for (br = main->brush.first; br; br = br->id.next) {
+		for (br = bmain->brush.first; br; br = br->id.next) {
 			br->fill_threshold = 0.2f;
 		}
 
 		if (!DNA_struct_elem_find(fd->filesdna, "BevelModifierData", "int", "mat")) {
 			Object *ob;
-			for (ob = main->object.first; ob; ob = ob->id.next) {
+			for (ob = bmain->object.first; ob; ob = ob->id.next) {
 				ModifierData *md;
 
 				for (md = ob->modifiers.first; md; md = md->next) {
@@ -561,9 +561,9 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *main)
 		}
 	}
 
-	if (!MAIN_VERSION_ATLEAST(main, 271, 6)) {
+	if (!MAIN_VERSION_ATLEAST(bmain, 271, 6)) {
 		Object *ob;
-		for (ob = main->object.first; ob; ob = ob->id.next) {
+		for (ob = bmain->object.first; ob; ob = ob->id.next) {
 			ModifierData *md;
 
 			for (md = ob->modifiers.first; md; md = md->next) {
@@ -577,27 +577,27 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *main)
 		}
 	}
 
-	if (!MAIN_VERSION_ATLEAST(main, 272, 0)) {
+	if (!MAIN_VERSION_ATLEAST(bmain, 272, 0)) {
 		if (!DNA_struct_elem_find(fd->filesdna, "RenderData", "int", "preview_start_resolution")) {
 			Scene *scene;
-			for (scene = main->scene.first; scene; scene = scene->id.next) {
+			for (scene = bmain->scene.first; scene; scene = scene->id.next) {
 				scene->r.preview_start_resolution = 64;
 			}
 		}
 	}
 
-	if (!MAIN_VERSION_ATLEAST(main, 272, 1)) {
+	if (!MAIN_VERSION_ATLEAST(bmain, 272, 1)) {
 		Brush *br;
-		for (br = main->brush.first; br; br = br->id.next) {
+		for (br = bmain->brush.first; br; br = br->id.next) {
 			if ((br->ob_mode & OB_MODE_SCULPT) && ELEM(br->sculpt_tool, SCULPT_TOOL_GRAB, SCULPT_TOOL_SNAKE_HOOK))
 				br->alpha = 1.0f;
 		}
 	}
 
-	if (!MAIN_VERSION_ATLEAST(main, 272, 2)) {
+	if (!MAIN_VERSION_ATLEAST(bmain, 272, 2)) {
 		if (!DNA_struct_elem_find(fd->filesdna, "Image", "float", "gen_color")) {
 			Image *image;
-			for (image = main->image.first; image != NULL; image = image->id.next) {
+			for (image = bmain->image.first; image != NULL; image = image->id.next) {
 				image->gen_color[3] = 1.0f;
 			}
 		}
@@ -606,7 +606,7 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *main)
 			Object *ob;
 
 			/* Update Transform constraint (again :|). */
-			for (ob = main->object.first; ob; ob = ob->id.next) {
+			for (ob = bmain->object.first; ob; ob = ob->id.next) {
 				do_version_constraints_stretch_to_limits(&ob->constraints);
 
 				if (ob->pose) {
@@ -620,13 +620,13 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *main)
 		}
 	}
 
-	if (!MAIN_VERSION_ATLEAST(main, 273, 1)) {
+	if (!MAIN_VERSION_ATLEAST(bmain, 273, 1)) {
 #define	BRUSH_RAKE (1 << 7)
 #define BRUSH_RANDOM_ROTATION (1 << 25)
 
 		Brush *br;
 
-		for (br = main->brush.first; br; br = br->id.next) {
+		for (br = bmain->brush.first; br; br = br->id.next) {
 			if (br->flag & BRUSH_RAKE) {
 				br->mtex.brush_angle_mode |= MTEX_ANGLE_RAKE;
 				br->mask_mtex.brush_angle_mode |= MTEX_ANGLE_RAKE;
@@ -644,11 +644,11 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *main)
 #undef BRUSH_RANDOM_ROTATION
 
 	/* Customizable Safe Areas */
-	if (!MAIN_VERSION_ATLEAST(main, 273, 2)) {
+	if (!MAIN_VERSION_ATLEAST(bmain, 273, 2)) {
 		if (!DNA_struct_elem_find(fd->filesdna, "Scene", "DisplaySafeAreas", "safe_areas")) {
 			Scene *scene;
 
-			for (scene = main->scene.first; scene; scene = scene->id.next) {
+			for (scene = bmain->scene.first; scene; scene = scene->id.next) {
 				copy_v2_fl2(scene->safe_areas.title, 3.5f / 100.0f, 3.5f / 100.0f);
 				copy_v2_fl2(scene->safe_areas.action, 10.0f / 100.0f, 5.0f / 100.0f);
 				copy_v2_fl2(scene->safe_areas.title_center, 17.5f / 100.0f, 5.0f / 100.0f);
@@ -657,9 +657,9 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *main)
 		}
 	}
 	
-	if (!MAIN_VERSION_ATLEAST(main, 273, 3)) {
+	if (!MAIN_VERSION_ATLEAST(bmain, 273, 3)) {
 		ParticleSettings *part;
-		for (part = main->particle.first; part; part = part->id.next) {
+		for (part = bmain->particle.first; part; part = part->id.next) {
 			if (part->clumpcurve)
 				part->child_flag |= PART_CHILD_USE_CLUMP_CURVE;
 			if (part->roughcurve)
@@ -667,11 +667,11 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *main)
 		}
 	}
 
-	if (!MAIN_VERSION_ATLEAST(main, 273, 6)) {
+	if (!MAIN_VERSION_ATLEAST(bmain, 273, 6)) {
 		if (!DNA_struct_elem_find(fd->filesdna, "ClothSimSettings", "float", "bending_damping")) {
 			Object *ob;
 			ModifierData *md;
-			for (ob = main->object.first; ob; ob = ob->id.next) {
+			for (ob = bmain->object.first; ob; ob = ob->id.next) {
 				for (md = ob->modifiers.first; md; md = md->next) {
 					if (md->type == eModifierType_Cloth) {
 						ClothModifierData *clmd = (ClothModifierData *)md;
@@ -689,21 +689,21 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *main)
 
 		if (!DNA_struct_elem_find(fd->filesdna, "ParticleSettings", "float", "clump_noise_size")) {
 			ParticleSettings *part;
-			for (part = main->particle.first; part; part = part->id.next) {
+			for (part = bmain->particle.first; part; part = part->id.next) {
 				part->clump_noise_size = 1.0f;
 			}
 		}
 
 		if (!DNA_struct_elem_find(fd->filesdna, "ParticleSettings", "int", "kink_extra_steps")) {
 			ParticleSettings *part;
-			for (part = main->particle.first; part; part = part->id.next) {
+			for (part = bmain->particle.first; part; part = part->id.next) {
 				part->kink_extra_steps = 4;
 			}
 		}
 
 		if (!DNA_struct_elem_find(fd->filesdna, "MTex", "float", "kinkampfac")) {
 			ParticleSettings *part;
-			for (part = main->particle.first; part; part = part->id.next) {
+			for (part = bmain->particle.first; part; part = part->id.next) {
 				int a;
 				for (a = 0; a < MAX_MTEX; a++) {
 					MTex *mtex = part->mtex[a];
@@ -717,7 +717,7 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *main)
 		if (!DNA_struct_elem_find(fd->filesdna, "HookModifierData", "char", "flag")) {
 			Object *ob;
 
-			for (ob = main->object.first; ob; ob = ob->id.next) {
+			for (ob = bmain->object.first; ob; ob = ob->id.next) {
 				ModifierData *md;
 				for (md = ob->modifiers.first; md; md = md->next) {
 					if (md->type == eModifierType_Hook) {
@@ -729,7 +729,7 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *main)
 		}
 
 		if (!DNA_struct_elem_find(fd->filesdna, "NodePlaneTrackDeformData", "char", "flag")) {
-			FOREACH_NODETREE(main, ntree, id) {
+			FOREACH_NODETREE(bmain, ntree, id) {
 				if (ntree->type == NTREE_COMPOSIT) {
 					bNode *node;
 					for (node = ntree->nodes.first; node; node = node->next) {
@@ -747,7 +747,7 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *main)
 
 		if (!DNA_struct_elem_find(fd->filesdna, "Camera", "GPUDOFSettings", "gpu_dof")) {
 			Camera *ca;
-			for (ca = main->camera.first; ca; ca = ca->id.next) {
+			for (ca = bmain->camera.first; ca; ca = ca->id.next) {
 				ca->gpu_dof.fstop = 128.0f;
 				ca->gpu_dof.focal_length = 1.0f;
 				ca->gpu_dof.focus_distance = 1.0f;
@@ -756,9 +756,9 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *main)
 		}
 	}
 
-	if (!MAIN_VERSION_ATLEAST(main, 273, 8)) {
+	if (!MAIN_VERSION_ATLEAST(bmain, 273, 8)) {
 		Object *ob;
-		for (ob = main->object.first; ob != NULL; ob = ob->id.next) {
+		for (ob = bmain->object.first; ob != NULL; ob = ob->id.next) {
 			ModifierData *md;
 			for (md = ob->modifiers.last; md != NULL; md = md->prev) {
 				if (modifier_unique_name(&ob->modifiers, md)) {
@@ -770,14 +770,14 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *main)
 		}
 	}
 
-	if (!MAIN_VERSION_ATLEAST(main, 273, 9)) {
+	if (!MAIN_VERSION_ATLEAST(bmain, 273, 9)) {
 		bScreen *scr;
 		ScrArea *sa;
 		SpaceLink *sl;
 		ARegion *ar;
 
 		/* Make sure sequencer preview area limits zoom */
-		for (scr = main->screen.first; scr; scr = scr->id.next) {
+		for (scr = bmain->screen.first; scr; scr = scr->id.next) {
 			for (sa = scr->areabase.first; sa; sa = sa->next) {
 				for (sl = sa->spacedata.first; sl; sl = sl->next) {
 					if (sl->spacetype == SPACE_SEQ) {
@@ -795,12 +795,12 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *main)
 		}
 	}
 
-	if (!MAIN_VERSION_ATLEAST(main, 274, 1)) {
+	if (!MAIN_VERSION_ATLEAST(bmain, 274, 1)) {
 		/* particle systems need to be forced to redistribute for jitter mode fix */
 		{
 			Object *ob;
 			ParticleSystem *psys;
-			for (ob = main->object.first; ob; ob = ob->id.next) {
+			for (ob = bmain->object.first; ob; ob = ob->id.next) {
 				for (psys = ob->particlesystem.first; psys; psys = psys->next) {
 					if ((psys->pointcache->flag & PTCACHE_BAKED) == 0) {
 						psys->recalc |= PSYS_RECALC_RESET;
@@ -812,7 +812,7 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *main)
 		/* hysteresis setted to 10% but not actived */
 		if (!DNA_struct_elem_find(fd->filesdna, "LodLevel", "int", "obhysteresis")) {
 			Object *ob;
-			for (ob = main->object.first; ob; ob = ob->id.next) {
+			for (ob = bmain->object.first; ob; ob = ob->id.next) {
 				LodLevel *level;
 				for (level = ob->lodlevels.first; level; level = level->next) {
 					level->obhysteresis = 10;
@@ -821,7 +821,7 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *main)
 		}
 	}
 
-	if (!MAIN_VERSION_ATLEAST(main, 274, 4)) {
+	if (!MAIN_VERSION_ATLEAST(bmain, 274, 4)) {
 		SceneRenderView *srv;
 		wmWindowManager *wm;
 		bScreen *screen;
@@ -830,7 +830,7 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *main)
 		Camera *cam;
 		Image *ima;
 
-		for (scene = main->scene.first; scene; scene = scene->id.next) {
+		for (scene = bmain->scene.first; scene; scene = scene->id.next) {
 			Sequence *seq;
 
 			BKE_scene_add_render_view(scene, STEREO_LEFT_NAME);
@@ -860,7 +860,7 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *main)
 			SEQ_END
 		}
 
-		for (screen = main->screen.first; screen; screen = screen->id.next) {
+		for (screen = bmain->screen.first; screen; screen = screen->id.next) {
 			ScrArea *sa;
 			for (sa = screen->areabase.first; sa; sa = sa->next) {
 				SpaceLink *sl;
@@ -887,12 +887,12 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *main)
 			}
 		}
 
-		for (cam = main->camera.first; cam; cam = cam->id.next) {
+		for (cam = bmain->camera.first; cam; cam = cam->id.next) {
 			cam->stereo.interocular_distance = 0.065f;
 			cam->stereo.convergence_distance = 30.0f * 0.065f;
 		}
 
-		for (ima = main->image.first; ima; ima = ima->id.next) {
+		for (ima = bmain->image.first; ima; ima = ima->id.next) {
 			ima->stereo3d_format = MEM_callocN(sizeof(Stereo3dFormat), "Image Stereo 3d Format");
 
 			if (ima->packedfile) {
@@ -905,18 +905,18 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *main)
 			}
 		}
 
-		for (wm = main->wm.first; wm; wm = wm->id.next) {
+		for (wm = bmain->wm.first; wm; wm = wm->id.next) {
 			for (win = wm->windows.first; win; win = win->next) {
 				win->stereo3d_format = MEM_callocN(sizeof(Stereo3dFormat), "Stereo Display 3d Format");
 			}
 		}
 	}
 
-	if (!MAIN_VERSION_ATLEAST(main, 274, 6)) {
+	if (!MAIN_VERSION_ATLEAST(bmain, 274, 6)) {
 		bScreen *screen;
 
 		if (!DNA_struct_elem_find(fd->filesdna, "FileSelectParams", "int", "thumbnail_size")) {
-			for (screen = main->screen.first; screen; screen = screen->id.next) {
+			for (screen = bmain->screen.first; screen; screen = screen->id.next) {
 				ScrArea *sa;
 
 				for (sa = screen->areabase.first; sa; sa = sa->next) {
@@ -937,7 +937,7 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *main)
 
 		if (!DNA_struct_elem_find(fd->filesdna, "RenderData", "short", "simplify_subsurf_render")) {
 			Scene *scene;
-			for (scene = main->scene.first; scene != NULL; scene = scene->id.next) {
+			for (scene = bmain->scene.first; scene != NULL; scene = scene->id.next) {
 				scene->r.simplify_subsurf_render = scene->r.simplify_subsurf;
 				scene->r.simplify_particles_render = scene->r.simplify_particles;
 			}
@@ -946,7 +946,7 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *main)
 		if (!DNA_struct_elem_find(fd->filesdna, "DecimateModifierData", "float", "defgrp_factor")) {
 			Object *ob;
 
-			for (ob = main->object.first; ob; ob = ob->id.next) {
+			for (ob = bmain->object.first; ob; ob = ob->id.next) {
 				ModifierData *md;
 				for (md = ob->modifiers.first; md; md = md->next) {
 					if (md->type == eModifierType_Decimate) {
@@ -958,20 +958,20 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *main)
 		}
 	}
 
-	if (!MAIN_VERSION_ATLEAST(main, 275, 3)) {
+	if (!MAIN_VERSION_ATLEAST(bmain, 275, 3)) {
 		Brush *br;
 #define BRUSH_TORUS (1 << 1)
-		for (br = main->brush.first; br; br = br->id.next) {
+		for (br = bmain->brush.first; br; br = br->id.next) {
 			br->flag &= ~BRUSH_TORUS;
 		}
 #undef BRUSH_TORUS
 	}
 
-	if (!MAIN_VERSION_ATLEAST(main, 276, 2)) {
+	if (!MAIN_VERSION_ATLEAST(bmain, 276, 2)) {
 		if (!DNA_struct_elem_find(fd->filesdna, "bPoseChannel", "float", "custom_scale")) {
 			Object *ob;
 
-			for (ob = main->object.first; ob; ob = ob->id.next) {
+			for (ob = bmain->object.first; ob; ob = ob->id.next) {
 				if (ob->pose) {
 					bPoseChannel *pchan;
 					for (pchan = ob->pose->chanbase.first; pchan; pchan = pchan->next) {
@@ -984,7 +984,7 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *main)
 		{
 			bScreen *screen;
 #define RV3D_VIEW_PERSPORTHO	 7
-			for (screen = main->screen.first; screen; screen = screen->id.next) {
+			for (screen = bmain->screen.first; screen; screen = screen->id.next) {
 				ScrArea *sa;
 				for (sa = screen->areabase.first; sa; sa = sa->next) {
 					SpaceLink *sl;
@@ -1013,7 +1013,7 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *main)
 		{
 			Lamp *lamp;
 #define LA_YF_PHOTON	5
-			for (lamp = main->lamp.first; lamp; lamp = lamp->id.next) {
+			for (lamp = bmain->lamp.first; lamp; lamp = lamp->id.next) {
 				if (lamp->type == LA_YF_PHOTON) {
 					lamp->type = LA_LOCAL;
 				}
@@ -1022,10 +1022,10 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *main)
 		}
 	}
 
-	if (!MAIN_VERSION_ATLEAST(main, 276, 3)) {
+	if (!MAIN_VERSION_ATLEAST(bmain, 276, 3)) {
 		if (!DNA_struct_elem_find(fd->filesdna, "RenderData", "CurveMapping", "mblur_shutter_curve")) {
 			Scene *scene;
-			for (scene = main->scene.first; scene != NULL; scene = scene->id.next) {
+			for (scene = bmain->scene.first; scene != NULL; scene = scene->id.next) {
 				CurveMapping *curve_mapping = &scene->r.mblur_shutter_curve;
 				curvemapping_set_defaults(curve_mapping, 1, 0.0f, 0.0f, 1.0f, 1.0f);
 				curvemapping_initialize(curve_mapping);
@@ -1037,8 +1037,8 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *main)
 		}
 	}
 
-	if (!MAIN_VERSION_ATLEAST(main, 276, 4)) {
-		for (Scene *scene = main->scene.first; scene; scene = scene->id.next) {
+	if (!MAIN_VERSION_ATLEAST(bmain, 276, 4)) {
+		for (Scene *scene = bmain->scene.first; scene; scene = scene->id.next) {
 			ToolSettings *ts = scene->toolsettings;
 			
 			if (ts->gp_sculpt.brush[0].size == 0) {
@@ -1113,7 +1113,7 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *main)
 			}
 		}
 		
-		for (bGPdata *gpd = main->gpencil.first; gpd; gpd = gpd->id.next) {
+		for (bGPdata *gpd = bmain->gpencil.first; gpd; gpd = gpd->id.next) {
 			bool enabled = false;
 			
 			/* Ensure that the datablock's onionskinning toggle flag
@@ -1131,13 +1131,13 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *main)
 				gpd->flag &= ~GP_DATA_SHOW_ONIONSKINS;
 		}
 	}
-	if (!MAIN_VERSION_ATLEAST(main, 276, 5)) {
+	if (!MAIN_VERSION_ATLEAST(bmain, 276, 5)) {
 		ListBase *lbarray[MAX_LIBARRAY];
 		int a;
 
 		/* Important to clear all non-persistent flags from older versions here, otherwise they could collide
 		 * with any new persistent flag we may add in the future. */
-		a = set_listbasepointers(main, lbarray);
+		a = set_listbasepointers(bmain, lbarray);
 		while (a--) {
 			for (ID *id = lbarray[a]->first; id; id = id->next) {
 				id->flag &= LIB_FAKEUSER;
@@ -1145,15 +1145,15 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *main)
 		}
 	}
 
-	if (!MAIN_VERSION_ATLEAST(main, 276, 7)) {
+	if (!MAIN_VERSION_ATLEAST(bmain, 276, 7)) {
 		Scene *scene;
-		for (scene = main->scene.first; scene != NULL; scene = scene->id.next) {
+		for (scene = bmain->scene.first; scene != NULL; scene = scene->id.next) {
 			scene->r.bake.pass_filter = R_BAKE_PASS_FILTER_ALL;
 		}
 	}
 
-	if (!MAIN_VERSION_ATLEAST(main, 277, 1)) {
-		for (Scene *scene = main->scene.first; scene; scene = scene->id.next) {
+	if (!MAIN_VERSION_ATLEAST(bmain, 277, 1)) {
+		for (Scene *scene = bmain->scene.first; scene; scene = scene->id.next) {
 			ParticleEditSettings *pset = &scene->toolsettings->particle;
 			for (int a = 0; a < ARRAY_SIZE(pset->brush); a++) {
 				if (pset->brush[a].strength > 1.0f) {
@@ -1162,7 +1162,7 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *main)
 			}
 		}
 
-		for (bScreen *screen = main->screen.first; screen; screen = screen->id.next) {
+		for (bScreen *screen = bmain->screen.first; screen; screen = screen->id.next) {
 			for (ScrArea *sa = screen->areabase.first; sa; sa = sa->next) {
 				for (SpaceLink *sl = sa->spacedata.first; sl; sl = sl->next) {
 					ListBase *regionbase = (sl == sa->spacedata.first) ? &sa->regionbase : &sl->regionbase;
@@ -1195,7 +1195,7 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *main)
 			}
 		}
 
-		for (Scene *scene = main->scene.first; scene; scene = scene->id.next) {
+		for (Scene *scene = bmain->scene.first; scene; scene = scene->id.next) {
 			CurvePaintSettings *cps = &scene->toolsettings->curve_paint_settings;
 			if (cps->error_threshold == 0) {
 				cps->curve_type = CU_BEZIER;
@@ -1206,7 +1206,7 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *main)
 			}
 		}
 
-		for (Scene *scene = main->scene.first; scene; scene = scene->id.next) {
+		for (Scene *scene = bmain->scene.first; scene; scene = scene->id.next) {
 			Sequence *seq;
 
 			SEQ_BEGIN (scene->ed, seq)
@@ -1230,7 +1230,7 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *main)
 		}
 
 		/* Adding "Properties" region to DopeSheet */
-		for (bScreen *screen = main->screen.first; screen; screen = screen->id.next) {
+		for (bScreen *screen = bmain->screen.first; screen; screen = screen->id.next) {
 			for (ScrArea *sa = screen->areabase.first; sa; sa = sa->next) {
 				/* handle pushed-back space data first */
 				for (SpaceLink *sl = sa->spacedata.first; sl; sl = sl->next) {
@@ -1248,14 +1248,14 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *main)
 		}
 	}
 
-	if (!MAIN_VERSION_ATLEAST(main, 277, 2)) {
+	if (!MAIN_VERSION_ATLEAST(bmain, 277, 2)) {
 		if (!DNA_struct_elem_find(fd->filesdna, "Bone", "float", "scaleIn")) {
-			for (bArmature *arm = main->armature.first; arm; arm = arm->id.next) {
+			for (bArmature *arm = bmain->armature.first; arm; arm = arm->id.next) {
 				do_version_bones_super_bbone(&arm->bonebase);
 			}
 		}
 		if (!DNA_struct_elem_find(fd->filesdna, "bPoseChannel", "float", "scaleIn")) {
-			for (Object *ob = main->object.first; ob; ob = ob->id.next) {
+			for (Object *ob = bmain->object.first; ob; ob = ob->id.next) {
 				if (ob->pose) {
 					for (bPoseChannel *pchan = ob->pose->chanbase.first; pchan; pchan = pchan->next) {
 						/* see do_version_bones_super_bbone()... */
@@ -1275,7 +1275,7 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *main)
 			}
 		}
 
-		for (Camera *camera = main->camera.first; camera != NULL; camera = camera->id.next) {
+		for (Camera *camera = bmain->camera.first; camera != NULL; camera = camera->id.next) {
 			if (camera->stereo.pole_merge_angle_from == 0.0f &&
 			    camera->stereo.pole_merge_angle_to == 0.0f)
 			{
@@ -1287,7 +1287,7 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *main)
 		if (!DNA_struct_elem_find(fd->filesdna, "NormalEditModifierData", "float", "mix_limit")) {
 			Object *ob;
 
-			for (ob = main->object.first; ob; ob = ob->id.next) {
+			for (ob = bmain->object.first; ob; ob = ob->id.next) {
 				ModifierData *md;
 				for (md = ob->modifiers.first; md; md = md->next) {
 					if (md->type == eModifierType_NormalEdit) {
@@ -1300,7 +1300,7 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *main)
 
 		if (!DNA_struct_elem_find(fd->filesdna, "BooleanModifierData", "float", "double_threshold")) {
 			Object *ob;
-			for (ob = main->object.first; ob; ob = ob->id.next) {
+			for (ob = bmain->object.first; ob; ob = ob->id.next) {
 				ModifierData *md;
 				for (md = ob->modifiers.first; md; md = md->next) {
 					if (md->type == eModifierType_Boolean) {
@@ -1311,7 +1311,7 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *main)
 			}
 		}
 
-		for (Brush *br = main->brush.first; br; br = br->id.next) {
+		for (Brush *br = bmain->brush.first; br; br = br->id.next) {
 			if (br->sculpt_tool == SCULPT_TOOL_FLATTEN) {
 				br->flag |= BRUSH_ACCUMULATE;
 			}
@@ -1320,7 +1320,7 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *main)
 		if (!DNA_struct_elem_find(fd->filesdna, "ClothSimSettings", "float", "time_scale")) {
 			Object *ob;
 			ModifierData *md;
-			for (ob = main->object.first; ob; ob = ob->id.next) {
+			for (ob = bmain->object.first; ob; ob = ob->id.next) {
 				for (md = ob->modifiers.first; md; md = md->next) {
 					if (md->type == eModifierType_Cloth) {
 						ClothModifierData *clmd = (ClothModifierData *)md;
@@ -1337,10 +1337,10 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *main)
 		}
 	}
 
-	if (!MAIN_VERSION_ATLEAST(main, 277, 3)) {
+	if (!MAIN_VERSION_ATLEAST(bmain, 277, 3)) {
 		/* ------- init of grease pencil initialization --------------- */
 		if (!DNA_struct_elem_find(fd->filesdna, "bGPDstroke", "bGPDpalettecolor", "*palcolor")) {
-			for (Scene *scene = main->scene.first; scene; scene = scene->id.next) {
+			for (Scene *scene = bmain->scene.first; scene; scene = scene->id.next) {
 				ToolSettings *ts = scene->toolsettings;
 				/* initialize use position for sculpt brushes */
 				ts->gp_sculpt.flag |= GP_BRUSHEDIT_FLAG_APPLY_POSITION;
@@ -1359,8 +1359,8 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *main)
 				}
 			}
 			/* create a default grease pencil drawing brushes set */
-			if (!BLI_listbase_is_empty(&main->gpencil)) {
-				for (Scene *scene = main->scene.first; scene; scene = scene->id.next) {
+			if (!BLI_listbase_is_empty(&bmain->gpencil)) {
+				for (Scene *scene = bmain->scene.first; scene; scene = scene->id.next) {
 					ToolSettings *ts = scene->toolsettings;
 					if (BLI_listbase_is_empty(&ts->gp_brushes)) {
 						BKE_gpencil_brush_init_presets(ts);
@@ -1370,7 +1370,7 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *main)
 			/* Convert Grease Pencil to new palettes/brushes
 			 * Loop all strokes and create the palette and all colors
 			 */
-			for (bGPdata *gpd = main->gpencil.first; gpd; gpd = gpd->id.next) {
+			for (bGPdata *gpd = bmain->gpencil.first; gpd; gpd = gpd->id.next) {
 				if (BLI_listbase_is_empty(&gpd->palettes)) {
 					/* create palette */
 					bGPDpalette *palette = BKE_gpencil_palette_addnew(gpd, "GP_Palette", true);
@@ -1423,10 +1423,10 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *main)
 		/* ------- end of grease pencil initialization --------------- */
 	}
 
-	if (!MAIN_VERSION_ATLEAST(main, 278, 0)) {
+	if (!MAIN_VERSION_ATLEAST(bmain, 278, 0)) {
 		if (!DNA_struct_elem_find(fd->filesdna, "MovieTrackingTrack", "float", "weight_stab")) {
 			MovieClip *clip;
-			for (clip = main->movieclip.first; clip; clip = clip->id.next) {
+			for (clip = bmain->movieclip.first; clip; clip = clip->id.next) {
 				MovieTracking *tracking = &clip->tracking;
 				MovieTrackingObject *tracking_object;
 				for (tracking_object = tracking->objects.first;
@@ -1447,7 +1447,7 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *main)
 
 		if (!DNA_struct_elem_find(fd->filesdna, "MovieTrackingStabilization", "int", "tot_rot_track")) {
 			MovieClip *clip;
-			for (clip = main->movieclip.first; clip != NULL; clip = clip->id.next) {
+			for (clip = bmain->movieclip.first; clip != NULL; clip = clip->id.next) {
 				if (clip->tracking.stabilization.rot_track) {
 					migrate_single_rot_stabilization_track_settings(&clip->tracking.stabilization);
 				}
@@ -1467,15 +1467,15 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *main)
 			}
 		}
 	}
-	if (!MAIN_VERSION_ATLEAST(main, 278, 2)) {
+	if (!MAIN_VERSION_ATLEAST(bmain, 278, 2)) {
 		if (!DNA_struct_elem_find(fd->filesdna, "FFMpegCodecData", "int", "ffmpeg_preset")) {
-			for (Scene *scene = main->scene.first; scene; scene = scene->id.next) {
+			for (Scene *scene = bmain->scene.first; scene; scene = scene->id.next) {
 				/* "medium" is the preset FFmpeg uses when no presets are given. */
 				scene->r.ffcodecdata.ffmpeg_preset = FFM_PRESET_MEDIUM;
 			}
 		}
 		if (!DNA_struct_elem_find(fd->filesdna, "FFMpegCodecData", "int", "constant_rate_factor")) {
-			for (Scene *scene = main->scene.first; scene; scene = scene->id.next) {
+			for (Scene *scene = bmain->scene.first; scene; scene = scene->id.next) {
 				/* fall back to behaviour from before we introduced CRF for old files */
 				scene->r.ffcodecdata.constant_rate_factor = FFM_CRF_NONE;
 			}
@@ -1485,7 +1485,7 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *main)
 			Object *ob;
 			ModifierData *md;
 
-			for (ob = main->object.first; ob; ob = ob->id.next) {
+			for (ob = bmain->object.first; ob; ob = ob->id.next) {
 				for (md = ob->modifiers.first; md; md = md->next) {
 					if (md->type == eModifierType_Smoke) {
 						SmokeModifierData *smd = (SmokeModifierData *)md;
@@ -1500,8 +1500,8 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *main)
 		}
 	}
 
-	if (!MAIN_VERSION_ATLEAST(main, 278, 3)) {
-		for (Scene *scene = main->scene.first; scene != NULL; scene = scene->id.next) {
+	if (!MAIN_VERSION_ATLEAST(bmain, 278, 3)) {
+		for (Scene *scene = bmain->scene.first; scene != NULL; scene = scene->id.next) {
 			if (scene->toolsettings != NULL) {
 				ToolSettings *ts = scene->toolsettings;
 				ParticleEditSettings *pset = &ts->particle;
@@ -1515,7 +1515,7 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *main)
 
 		if (!DNA_struct_elem_find(fd->filesdna, "RigidBodyCon", "float", "spring_stiffness_ang_x")) {
 			Object *ob;
-			for (ob = main->object.first; ob; ob = ob->id.next) {
+			for (ob = bmain->object.first; ob; ob = ob->id.next) {
 				RigidBodyCon *rbc = ob->rigidbody_constraint;
 				if (rbc) {
 					rbc->spring_stiffness_ang_x = 10.0;
@@ -1530,7 +1530,7 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *main)
 
 		/* constant detail for sculpting is now a resolution value instead of
 		 * a percentage, we reuse old DNA struct member but convert it */
-		for (Scene *scene = main->scene.first; scene != NULL; scene = scene->id.next) {
+		for (Scene *scene = bmain->scene.first; scene != NULL; scene = scene->id.next) {
 			if (scene->toolsettings != NULL) {
 				ToolSettings *ts = scene->toolsettings;
 				if (ts->sculpt && ts->sculpt->constant_detail != 0.0f) {
@@ -1540,16 +1540,16 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *main)
 		}
 	}
 
-	if (!MAIN_VERSION_ATLEAST(main, 278, 4)) {
+	if (!MAIN_VERSION_ATLEAST(bmain, 278, 4)) {
 		const float sqrt_3 = (float)M_SQRT3;
-		for (Brush *br = main->brush.first; br; br = br->id.next) {
+		for (Brush *br = bmain->brush.first; br; br = br->id.next) {
 			br->fill_threshold /= sqrt_3;
 		}
 
 		/* Custom motion paths */
 		if (!DNA_struct_elem_find(fd->filesdna, "bMotionPath", "int", "line_thickness")) {
 			Object *ob;
-			for (ob = main->object.first; ob; ob = ob->id.next) {
+			for (ob = bmain->object.first; ob; ob = ob->id.next) {
 				bMotionPath *mpath;
 				bPoseChannel *pchan;
 				mpath = ob->mpath;
@@ -1577,9 +1577,9 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *main)
 		}
 	}
 
-	if (!MAIN_VERSION_ATLEAST(main, 278, 5)) {
+	if (!MAIN_VERSION_ATLEAST(bmain, 278, 5)) {
 		/* Mask primitive adding code was not initializing correctly id_type of its points' parent. */
-		for (Mask *mask = main->mask.first; mask; mask = mask->id.next) {
+		for (Mask *mask = bmain->mask.first; mask; mask = mask->id.next) {
 			for (MaskLayer *mlayer = mask->masklayers.first; mlayer; mlayer = mlayer->next) {
 				for (MaskSpline *mspline = mlayer->splines.first; mspline; mspline = mspline->next) {
 					int i = 0;
@@ -1594,7 +1594,7 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *main)
 
 		/* Fix for T50736, Glare comp node using same var for two different things. */
 		if (!DNA_struct_elem_find(fd->filesdna, "NodeGlare", "char", "star_45")) {
-			FOREACH_NODETREE(main, ntree, id) {
+			FOREACH_NODETREE(bmain, ntree, id) {
 				if (ntree->type == NTREE_COMPOSIT) {
 					ntreeSetTypes(NULL, ntree);
 					for (bNode *node = ntree->nodes.first; node; node = node->next) {
@@ -1617,7 +1617,7 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *main)
 		}
 
 		if (!DNA_struct_elem_find(fd->filesdna, "SurfaceDeformModifierData", "float", "mat[4][4]")) {
-			for (Object *ob = main->object.first; ob; ob = ob->id.next) {
+			for (Object *ob = bmain->object.first; ob; ob = ob->id.next) {
 				for (ModifierData *md = ob->modifiers.first; md; md = md->next) {
 					if (md->type == eModifierType_SurfaceDeform) {
 						SurfaceDeformModifierData *smd = (SurfaceDeformModifierData *)md;
@@ -1627,32 +1627,32 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *main)
 			}
 		}
 
-		FOREACH_NODETREE(main, ntree, id) {
+		FOREACH_NODETREE(bmain, ntree, id) {
 			if (ntree->type == NTREE_COMPOSIT) {
 				do_versions_compositor_render_passes(ntree);
 			}
 		} FOREACH_NODETREE_END
 	}
 
-	if (!MAIN_VERSION_ATLEAST(main, 279, 0)) {
-		for (Scene *scene = main->scene.first; scene; scene = scene->id.next) {
+	if (!MAIN_VERSION_ATLEAST(bmain, 279, 0)) {
+		for (Scene *scene = bmain->scene.first; scene; scene = scene->id.next) {
 			if (scene->r.im_format.exr_codec == R_IMF_EXR_CODEC_DWAB) {
 				scene->r.im_format.exr_codec = R_IMF_EXR_CODEC_DWAA;
 			}
 		}
 
 		/* Fix related to VGroup modifiers creating named defgroup CD layers! See T51520. */
-		for (Mesh *me = main->mesh.first; me; me = me->id.next) {
+		for (Mesh *me = bmain->mesh.first; me; me = me->id.next) {
 			CustomData_set_layer_name(&me->vdata, CD_MDEFORMVERT, 0, "");
 		}
 	}
 
-	if (!MAIN_VERSION_ATLEAST(main, 279, 3)) {
+	if (!MAIN_VERSION_ATLEAST(bmain, 279, 3)) {
 		if (!DNA_struct_elem_find(fd->filesdna, "SmokeDomainSettings", "float", "clipping")) {
 			Object *ob;
 			ModifierData *md;
 
-			for (ob = main->object.first; ob; ob = ob->id.next) {
+			for (ob = bmain->object.first; ob; ob = ob->id.next) {
 				for (md = ob->modifiers.first; md; md = md->next) {
 					if (md->type == eModifierType_Smoke) {
 						SmokeModifierData *smd = (SmokeModifierData *)md;
@@ -1667,7 +1667,7 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *main)
 
 	{
 		/* Fix for invalid state of screen due to bug in older versions. */
-		for (bScreen *sc = main->screen.first; sc; sc = sc->id.next) {
+		for (bScreen *sc = bmain->screen.first; sc; sc = sc->id.next) {
 			for (ScrArea *sa = sc->areabase.first; sa; sa = sa->next) {
 				if (sa->full && sc->state == SCREENNORMAL) {
 					sa->full = NULL;
@@ -1676,7 +1676,7 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *main)
 		}
 
 		if (!DNA_struct_elem_find(fd->filesdna, "Brush", "float", "falloff_angle")) {
-			for (Brush *br = main->brush.first; br; br = br->id.next) {
+			for (Brush *br = bmain->brush.first; br; br = br->id.next) {
 				br->falloff_angle = DEG2RADF(80);
 				br->flag &= ~(
 				        BRUSH_FLAG_DEPRECATED_1 | BRUSH_FLAG_DEPRECATED_2 |
@@ -1684,7 +1684,7 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *main)
 				        BRUSH_FRONTFACE_FALLOFF);
 			}
 
-			for (Scene *scene = main->scene.first; scene; scene = scene->id.next) {
+			for (Scene *scene = bmain->scene.first; scene; scene = scene->id.next) {
 				ToolSettings *ts = scene->toolsettings;
 				for (int i = 0; i < 2; i++) {
 					VPaint *vp = i ? ts->vpaint : ts->wpaint;
@@ -1699,7 +1699,7 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *main)
 		/* Simple deform modifier no longer assumes Z axis (X for bend type).
 		 * Must set previous defaults. */
 		if (!DNA_struct_elem_find(fd->filesdna, "SimpleDeformModifierData", "char", "deform_axis")) {
-			for (Object *ob = main->object.first; ob; ob = ob->id.next) {
+			for (Object *ob = bmain->object.first; ob; ob = ob->id.next) {
 				for (ModifierData *md = ob->modifiers.first; md; md = md->next) {
 					if (md->type == eModifierType_SimpleDeform) {
 						SimpleDeformModifierData *smd = (SimpleDeformModifierData *)md;
@@ -1709,7 +1709,7 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *main)
 			}
 		}
 
-		for (Scene *scene = main->scene.first; scene; scene = scene->id.next) {
+		for (Scene *scene = bmain->scene.first; scene; scene = scene->id.next) {
 			int preset = scene->r.ffcodecdata.ffmpeg_preset;
 			if (preset == FFM_PRESET_NONE || preset >= FFM_PRESET_GOOD) {
 				continue;
@@ -1727,7 +1727,7 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *main)
 		}
 
 		if (!DNA_struct_elem_find(fd->filesdna, "ParticleInstanceModifierData", "float", "particle_amount")) {
-			for (Object *ob = main->object.first; ob; ob = ob->id.next) {
+			for (Object *ob = bmain->object.first; ob; ob = ob->id.next) {
 				for (ModifierData *md = ob->modifiers.first; md; md = md->next) {
 					if (md->type == eModifierType_ParticleInstance) {
 						ParticleInstanceModifierData *pimd = (ParticleInstanceModifierData *)md;
@@ -1740,11 +1740,11 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *main)
 	}
 }
 
-void do_versions_after_linking_270(Main *main)
+void do_versions_after_linking_270(Main *bmain)
 {
 	/* To be added to next subversion bump! */
-	if (!MAIN_VERSION_ATLEAST(main, 279, 0)) {
-		FOREACH_NODETREE(main, ntree, id) {
+	if (!MAIN_VERSION_ATLEAST(bmain, 279, 0)) {
+		FOREACH_NODETREE(bmain, ntree, id) {
 			if (ntree->type == NTREE_COMPOSIT) {
 				ntreeSetTypes(NULL, ntree);
 				for (bNode *node = ntree->nodes.first; node; node = node->next) {
@@ -1756,9 +1756,9 @@ void do_versions_after_linking_270(Main *main)
 		} FOREACH_NODETREE_END
 	}
 	
-	if (!MAIN_VERSION_ATLEAST(main, 279, 2)) {
+	if (!MAIN_VERSION_ATLEAST(bmain, 279, 2)) {
 		/* B-Bones (bbone_in/out -> bbone_easein/out) + Stepped FMod Frame Start/End fix */
 		/* if (!DNA_struct_elem_find(fd->filesdna, "Bone", "float", "bbone_easein")) */
-		BKE_fcurves_main_cb(main, do_version_bbone_easing_fcurve_fix, NULL);
+		BKE_fcurves_main_cb(bmain, do_version_bbone_easing_fcurve_fix, NULL);
 	}
 }