[Bf-blender-cvs] [df24bef] temp_localview_split: Make compatibility work properly

[Julian Eisel]

Commit: df24bef79db05d956f59e3c55998bf3343b6a5ca
Author: Julian Eisel
Date:   Sun Aug 7 22:32:56 2016 +0200
Branches: temp_localview_split
https://developer.blender.org/rBdf24bef79db05d956f59e3c55998bf3343b6a5ca

Make compatibility work properly

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

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 ae46da6..f0f3427 100644
--- a/source/blender/blenloader/intern/versioning_270.c
+++ b/source/blender/blenloader/intern/versioning_270.c
@@ -201,7 +201,7 @@ static void do_version_localview_areadata(View3D *v3d)
 	}
 
 	LocalViewAreaData *new_lvd = MEM_mallocN(sizeof(*v3d->localviewd), __func__);
-	new_lvd->info.viewbits = 0; /* XXX */
+	new_lvd->info.viewbits = (v3d->lay >> 24); /* old local view used last byte of v3d->lay */
 	new_lvd->near = old_lvd->near;
 	new_lvd->far = old_lvd->far;
 	new_lvd->drawtype = old_lvd->drawtype;
@@ -1361,7 +1361,9 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *main)
 	}
 
 	{
+		/* New local view storage */
 		if (!DNA_struct_elem_find(fd->filesdna, "View3D", "LocalViewAreaData", "localviewd")) {
+			/* update area/region data */
 			for (bScreen *screen = main->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) {
@@ -1377,6 +1379,10 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *main)
 					}
 				}
 			}
+			/* update object data */
+			for (Object *ob = main->object.first; ob; ob = ob->id.next) {
+				ob->localview.viewbits = (ob->lay >> 24); /* old local view used last byte of ob->lay */
+			}
 		}
 	}
 }