[Bf-blender-cvs] [f64c881f58d] greasepencil-object: Fix merge error

[Antonio Vazquez]

Commit: f64c881f58df5b2a25216f7418001901b7b3fe65
Author: Antonio Vazquez
Date:   Sat Oct 21 09:26:11 2017 +0200
Branches: greasepencil-object
https://developer.blender.org/rBf64c881f58df5b2a25216f7418001901b7b3fe65

Fix merge error

In a previous merge, this file was wrong.

===================================================================

M	source/blender/blenloader/intern/versioning_270.c

===================================================================

diff --git a/source/blender/blenloader/intern/versioning_270.c b/source/blender/blenloader/intern/versioning_270.c
index 5178f3233a1..1cc5359530a 100644
--- a/source/blender/blenloader/intern/versioning_270.c
+++ b/source/blender/blenloader/intern/versioning_270.c
@@ -1616,46 +1616,6 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *main)
 				}
 			}
 		}
-	}
-
-	{
-		if (!DNA_struct_elem_find(fd->filesdna, "View3DDebug", "char", "background")) {
-			bScreen *screen;
-
-			for (screen = main->screen.first; screen; screen = screen->id.next) {
-				ScrArea *sa;
-				for (sa = screen->areabase.first; sa; sa = sa->next) {
-					SpaceLink *sl;
-
-					for (sl = sa->spacedata.first; sl; sl = sl->next) {
-						switch (sl->spacetype) {
-							case SPACE_VIEW3D:
-							{
-								View3D *v3d = (View3D *)sl;
-								v3d->debug.background = V3D_DEBUG_BACKGROUND_NONE;
-							}
-						}
-					}
-				}
-			}
-		}
-	}
-
-	/* To be added to next subversion bump! */
-	{
-		/* 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 (MaskLayer *mlayer = mask->masklayers.first; mlayer; mlayer = mlayer->next) {
-				for (MaskSpline *mspline = mlayer->splines.first; mspline; mspline = mspline->next) {
-					int i = 0;
-					for (MaskSplinePoint *mspoint = mspline->points; i < mspline->tot_point; mspoint++, i++) {
-						if (mspoint->parent.id_type == 0) {
-							BKE_mask_parent_init(&mspoint->parent);
-						}
-					}
-				}
-			}
-		}
 
 		/* Fix for T50736, Glare comp node using same var for two different things. */
 		if (!DNA_struct_elem_find(fd->filesdna, "NodeGlare", "char", "star_45")) {