[Bf-blender-cvs] [52a7ecac35b] userpref_redesign: Merge branch 'master' into userpref_redesign

[Severin]

Commit: 52a7ecac35bef78bfc7e12fc3f228f3f9810cf5a
Author: Severin
Date:   Wed Jan 2 20:28:44 2019 +0100
Branches: userpref_redesign
https://developer.blender.org/rB52a7ecac35bef78bfc7e12fc3f228f3f9810cf5a

Merge branch 'master' into userpref_redesign

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



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

diff --cc source/blender/blenloader/intern/versioning_280.c
index 3c61f7c0156,85dfbdd1fec..723ce7fc2d8
--- a/source/blender/blenloader/intern/versioning_280.c
+++ b/source/blender/blenloader/intern/versioning_280.c
@@@ -2742,33 -2729,18 +2728,47 @@@ void blo_do_versions_280(FileData *fd, 
  			}
  		}
  
+ 		/* Grease pencil target weight  */
+ 		if (!DNA_struct_elem_find(fd->filesdna, "GP_Sculpt_Settings", "float", "weight")) {
+ 			for (Scene *scene = bmain->scene.first; scene; scene = scene->id.next) {
+ 				/* sculpt brushes */
+ 				GP_Sculpt_Settings *gset = &scene->toolsettings->gp_sculpt;
+ 				if (gset) {
+ 					for (int i = 0; i < GP_SCULPT_TYPE_MAX; i++) {
+ 						GP_Sculpt_Data *gp_brush = &gset->brush[i];
+ 						gp_brush->weight = 1.0f;
+ 					}
+ 				}
+ 			}
+ 		}
++
 +		for (bScreen *screen = bmain->screen.first; screen; screen = screen->id.next) {
 +			for (ScrArea *area = screen->areabase.first; area; area = area->next) {
 +				for (SpaceLink *sl = area->spacedata.first; sl; sl = sl->next) {
 +					if (sl->spacetype == SPACE_USERPREF) {
 +						ARegion *execute_region = BKE_spacedata_find_region_type(sl, area, RGN_TYPE_EXECUTE);
 +
 +						if (!execute_region) {
 +							ListBase *regionbase = (sl == area->spacedata.first) ? &area->regionbase : &sl->regionbase;
 +							ARegion *ar_navbar = BKE_spacedata_find_region_type(sl, area, RGN_TYPE_NAV_BAR);
 +
 +							execute_region = MEM_callocN(sizeof(ARegion), "execute region for properties");
 +
 +							BLI_assert(ar_navbar);
 +
 +							BLI_insertlinkafter(regionbase, ar_navbar, execute_region);
 +
 +							execute_region->regiontype = RGN_TYPE_EXECUTE;
 +							execute_region->alignment = RGN_ALIGN_BOTTOM | RGN_SPLIT_PREV;
 +							execute_region->flag |= RGN_FLAG_DYNAMIC_SIZE;
 +						}
 +					}
 +				}
 +			}
 +		}
 +	}
 +
 +	{
 +		/* Versioning code until next subversion bump goes here. */
  	}
  }