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

[Julian Eisel]

Commit: 1b722f1ac80b2eae824161f5aa5b2f167b4b7e4e
Author: Julian Eisel
Date:   Sun Dec 16 00:32:46 2018 +0100
Branches: userpref_redesign
https://developer.blender.org/rB1b722f1ac80b2eae824161f5aa5b2f167b4b7e4e

Merge branch 'blender2.8' into userpref_redesign

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



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

diff --cc release/scripts/addons
index 6706c91ecf7,f89d1c9581c..618c842c3e4
--- a/release/scripts/addons
+++ b/release/scripts/addons
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit 6706c91ecf7dd759293b5a7e0b2b75e3c1d7c2e1
 -Subproject commit f89d1c9581c03160485a7b4b09fa5d538331fdeb
++Subproject commit 618c842c3e486a7b83f81eabaa21ec4c59bafb0c
diff --cc release/scripts/addons_contrib
index 41d528d76b9,41d528d76b9..68a2d28b244
--- a/release/scripts/addons_contrib
+++ b/release/scripts/addons_contrib
@@@ -1,1 -1,1 +1,1 @@@
--Subproject commit 41d528d76b99e689e09915f5dcd589480579ef3a
++Subproject commit 68a2d28b24430133946f21d7deede1312d181aaf
diff --cc source/blender/blenloader/intern/versioning_280.c
index 11e1ce5ac23,5a1002702b3..8dea5a3d89b
--- a/source/blender/blenloader/intern/versioning_280.c
+++ b/source/blender/blenloader/intern/versioning_280.c
@@@ -2433,32 -2448,7 +2448,32 @@@ void blo_do_versions_280(FileData *fd, 
  		}
  	}
  
- 	if (!MAIN_VERSION_ATLEAST(bmain, 280, 34)) {
 -	if (!MAIN_VERSION_ATLEAST(bmain, 280, 36)) {
++	if (!MAIN_VERSION_ATLEAST(bmain, 280, 37)) {
 +		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. */
 +
  		if (!DNA_struct_elem_find(fd->filesdna, "View3DShading", "float", "curvature_ridge_factor")) {
  			for (bScreen *screen = bmain->screen.first; screen; screen = screen->id.next) {
  				for (ScrArea *sa = screen->areabase.first; sa; sa = sa->next) {
diff --cc source/tools
index 2278dd8d6ae,30d4611eacb..a8410dea7fa
--- a/source/tools
+++ b/source/tools
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit 2278dd8d6aea4d56632dee37196a5e341ce99283
 -Subproject commit 30d4611eacb1c5b27a5e9d2432cb12843054abc9
++Subproject commit a8410dea7faa6f081959629fddd31f0ba6f6d8b1