[Bf-blender-cvs] [f3aada6545] app-templates: Merge branch 'master' into app-templates

[Campbell Barton]

Commit: f3aada6545e4e973d45eab570228db15e45d9f7a
Author: Campbell Barton
Date:   Fri Mar 17 00:54:59 2017 +1100
Branches: app-templates
https://developer.blender.org/rBf3aada6545e4e973d45eab570228db15e45d9f7a

Merge branch 'master' into app-templates

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



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

diff --cc source/blender/windowmanager/intern/wm_files.c
index f52d338364,555017a9aa..37a5ba81dc
--- a/source/blender/windowmanager/intern/wm_files.c
+++ b/source/blender/windowmanager/intern/wm_files.c
@@@ -645,20 -629,21 +645,21 @@@ bool WM_file_read(bContext *C, const ch
  
  
  /**
-  * called on startup,  (context entirely filled with NULLs)
-  * or called for 'New File'
-  * both startup.blend and userpref.blend are checked
-  * the optional parameter custom_file points to an alternative startup page
-  * custom_file can be NULL
+  * Called on startup, (context entirely filled with NULLs)
+  * or called for 'New File' both startup.blend and userpref.blend are checked.
+  *
+  * \param from_memory: Ignore on-disk startup file, use bundled ``datatoc_startup_blend`` instead.
+  * Used for "Restore Factory Settings".
+  * \param filepath_startup_override: Optional path pointing to an alternative blend file (may be NULL).
   */
  int wm_homefile_read(
 -        bContext *C, ReportList *reports,
 -        bool from_memory, const char *filepath_startup_override)
 +        bContext *C, ReportList *reports, bool from_memory,
-         const char *custom_file, const char *custom_app_template)
++        const char *filepath_startup_override, const char *custom_app_template)
  {
  	ListBase wmbase;
- 	char startstr[FILE_MAX];
- 	char prefstr[FILE_MAX];
- 	int success = 0;
+ 	char filepath_startup[FILE_MAX];
+ 	char filepath_userdef[FILE_MAX];
+ 	bool success = false;
  
  	/* Indicates whether user preferences were really load from memory.
  	 *
diff --cc source/blender/windowmanager/wm_files.h
index a01fdf68ec,954d35722f..c64e879664
--- a/source/blender/windowmanager/wm_files.h
+++ b/source/blender/windowmanager/wm_files.h
@@@ -36,9 -36,8 +36,8 @@@ struct wmOperatorType
  /* wm_files.c */
  void		wm_history_file_read(void);
  int			wm_homefile_read(
 -        struct bContext *C, struct ReportList *reports,
 -        bool from_memory, const char *filepath_startup_override);
 +        struct bContext *C, struct ReportList *reports, bool from_memory,
-         const char *custom_file, const char *startup_template);
- 
++        const char *filepath_startup_override, const char *startup_template);
  void		wm_file_read_report(bContext *C);
  
  void        WM_OT_save_homefile(struct wmOperatorType *ot);