[Bf-blender-cvs] [9ed186ecdb] asset-engine: Merge branch 'master' into asset-engine

[Bastien Montagne]

Commit: 9ed186ecdb1e07ea1ae3e0fec67facd97ad7fcdb
Author: Bastien Montagne
Date:   Thu Mar 16 10:15:59 2017 +0100
Branches: asset-engine
https://developer.blender.org/rB9ed186ecdb1e07ea1ae3e0fec67facd97ad7fcdb

Merge branch 'master' into asset-engine

Conflicts:
	source/blender/blenloader/intern/writefile.c
	source/blender/windowmanager/intern/wm_files.c

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



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

diff --cc source/blender/blenloader/intern/writefile.c
index db54fa2604,01d07e0d77..44d2b9e58d
--- a/source/blender/blenloader/intern/writefile.c
+++ b/source/blender/blenloader/intern/writefile.c
@@@ -24,7 -24,7 +24,7 @@@
   * ***** END GPL LICENSE BLOCK *****
   */
  
--/** \file blender/blenloader/intern/writefile.c
++/** \file blender/blenloader/intern/	ile.c
   *  \ingroup blenloader
   */
  
diff --cc source/blender/windowmanager/intern/wm_files.c
index 0c224bcfaa,71a1d22ac8..7cad7e4a2a
--- a/source/blender/windowmanager/intern/wm_files.c
+++ b/source/blender/windowmanager/intern/wm_files.c
@@@ -554,11 -554,7 +554,11 @@@ bool WM_file_read(bContext *C, const ch
  		
  		/* confusing this global... */
  		G.relbase_valid = 1;
-         retval = BKE_blendfile_read(C, filepath, reports);
+ 		retval = BKE_blendfile_read(C, filepath, reports, 0);
 +
 +		printf("Updating assets for: %s\n", filepath);
 +		WM_operator_name_call(C, "WM_OT_assets_update_check", WM_OP_EXEC_DEFAULT, NULL);
 +
  		/* when loading startup.blend's, we can be left with a blank path */
  		if (G.main->name[0]) {
  			G.save_over = 1;
@@@ -695,12 -692,19 +696,22 @@@ int wm_homefile_read(bContext *C, Repor
  	/* put aside screens to match with persistent windows later */
  	wm_window_match_init(C, &wmbase);
  	
+ 	/* load preferences before startup.blend */
+ 	if (!from_memory && BLI_exists(prefstr)) {
+ 		int done = BKE_blendfile_read_userdef(prefstr, NULL);
+ 		if (done != BKE_BLENDFILE_READ_FAIL) {
+ 			read_userdef_from_memory = false;
+ 			skip_flags |= BLO_READ_SKIP_USERDEF;
+ 			printf("Read new prefs: %s\n", prefstr);
+ 		}
+ 	}
+ 
  	if (!from_memory) {
  		if (BLI_access(startstr, R_OK) == 0) {
- 			success = (BKE_blendfile_read(C, startstr, NULL) != BKE_BLENDFILE_READ_FAIL);
+ 			success = (BKE_blendfile_read(C, startstr, NULL, skip_flags) != BKE_BLENDFILE_READ_FAIL);
 +
 +			printf("Updating assets for: %s\n", startstr);
 +			WM_operator_name_call(C, "WM_OT_assets_update_check", WM_OP_EXEC_DEFAULT, NULL);
  		}
  		if (BLI_listbase_is_empty(&U.themes)) {
  			if (G.debug & G_DEBUG)