[Bf-blender-cvs] [ba567f634a6] userpref_redesign: Merge branch 'blender2.8' into userpref_redesign

[Julian Eisel]

Commit: ba567f634a66524bce793ef5c454bc8accc376cf
Author: Julian Eisel
Date:   Sun Nov 25 14:45:23 2018 +0100
Branches: userpref_redesign
https://developer.blender.org/rBba567f634a66524bce793ef5c454bc8accc376cf

Merge branch 'blender2.8' into userpref_redesign

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



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

diff --cc release/scripts/addons
index 6f0128c3322,acd39fc1b03..be2df524910
--- a/release/scripts/addons
+++ b/release/scripts/addons
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit 6f0128c332290c6f3639d4d949d3e06bfaa71022
 -Subproject commit acd39fc1b03e1f4a2d0b670189cde18db50a52e2
++Subproject commit be2df5249105015aaafb06def0d1279c559c56ff
diff --cc source/blender/blenloader/intern/versioning_280.c
index e7ec9c9abfc,2cf00bfe2c1..880d748e63e
--- a/source/blender/blenloader/intern/versioning_280.c
+++ b/source/blender/blenloader/intern/versioning_280.c
@@@ -2428,26 -2428,7 +2428,30 @@@ void blo_do_versions_280(FileData *fd, 
  		}
  	}
  
 +	{
 +		for (bScreen *screen = bmain->screen.first; screen; screen = screen->id.next) {
 +			for (ScrArea *area = screen->areabase.first; area; area = area->next) {
 +				for (SpaceLink *slink = area->spacedata.first; slink; slink = slink->next) {
 +					if (slink->spacetype == SPACE_USERPREF) {
 +						ARegion *navigation_region = BKE_spacedata_find_region_type(slink, area, RGN_TYPE_NAV_BAR);
 +
 +						if (!navigation_region) {
 +							ListBase *regionbase = (slink == area->spacedata.first) ?
 +							                           &area->regionbase : &slink->regionbase;
 +
 +							navigation_region = MEM_callocN(sizeof(ARegion), "userpref navigation-region do_versions");
 +
 +							BLI_addhead(regionbase, navigation_region); /* order matters, addhead not addtail! */
 +							navigation_region->regiontype = RGN_TYPE_NAV_BAR;
 +							navigation_region->alignment = RGN_ALIGN_LEFT;
 +						}
 +					}
 +				}
 +			}
 +		}
 +	}
++
+ 	{
+ 		/* Versioning code until next subversion bump goes here. */
+ 	}
  }