[Bf-blender-cvs] [b0bbfe1fc54] temp-workspace-addons: Merge branch 'blender2.8' into temp-workspace-addons

[Campbell Barton]

Commit: b0bbfe1fc5419947bfb0d79f11199d5b72fcc231
Author: Campbell Barton
Date:   Thu Feb 1 15:21:48 2018 +1100
Branches: temp-workspace-addons
https://developer.blender.org/rBb0bbfe1fc5419947bfb0d79f11199d5b72fcc231

Merge branch 'blender2.8' into temp-workspace-addons

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



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

diff --cc source/blender/blenloader/intern/writefile.c
index 28e3e3f3bd5,228dc4cf377..a093fa19d0a
--- a/source/blender/blenloader/intern/writefile.c
+++ b/source/blender/blenloader/intern/writefile.c
@@@ -1184,28 -1184,11 +1184,21 @@@ static void write_keymapitem(WriteData 
  	}
  }
  
- static void write_addons(WriteData *wd, ListBase *addons)
++static void write_addons(WriteData *wd, ListBase *addon_list)
 +{
- 	for (bAddon *bext = addons->first; bext; bext = bext->next) {
++	for (bAddon *bext = addon_list->first; bext; bext = bext->next) {
 +		writestruct(wd, DATA, bAddon, 1, bext);
 +		if (bext->prop) {
 +			IDP_WriteProperty(bext->prop, wd);
 +		}
 +	}
 +}
 +
- static void write_userdef(WriteData *wd)
+ static void write_userdef(WriteData *wd, const UserDef *userdef)
  {
- 	bTheme *btheme;
- 	wmKeyMap *keymap;
- 	wmKeyMapItem *kmi;
- 	wmKeyMapDiffItem *kmdi;
- 	bPathCompare *path_cmp;
- 	uiStyle *style;
+ 	writestruct(wd, USER, UserDef, 1, userdef);
  
- 	writestruct(wd, USER, UserDef, 1, &U);
- 
- 	for (btheme = U.themes.first; btheme; btheme = btheme->next) {
+ 	for (const bTheme *btheme = userdef->themes.first; btheme; btheme = btheme->next) {
  		writestruct(wd, DATA, bTheme, 1, btheme);
  	}
  
@@@ -1227,9 -1210,14 +1220,9 @@@
  		}
  	}
  
 -	for (const bAddon *bext = userdef->addons.first; bext; bext = bext->next) {
 -		writestruct(wd, DATA, bAddon, 1, bext);
 -		if (bext->prop) {
 -			IDP_WriteProperty(bext->prop, wd);
 -		}
 -	}
 +	write_addons(wd, &U.addons);
  
- 	for (path_cmp = U.autoexec_paths.first; path_cmp; path_cmp = path_cmp->next) {
+ 	for (const bPathCompare *path_cmp = userdef->autoexec_paths.first; path_cmp; path_cmp = path_cmp->next) {
  		writestruct(wd, DATA, bPathCompare, 1, path_cmp);
  	}
  
@@@ -3791,8 -3779,6 +3784,7 @@@ static void write_workspace(WriteData *
  	writelist(wd, DATA, WorkSpaceDataRelation, &workspace->hook_layout_relations);
  	writelist(wd, DATA, WorkSpaceDataRelation, &workspace->scene_viewlayer_relations);
  	writelist(wd, DATA, TransformOrientation, transform_orientations);
 +	write_addons(wd, &workspace->addons);
- 
  }
  
  /* Keep it last of write_foodata functions. */