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

[Campbell Barton]

Commit: 0ed06e282af5247c1bf13d9b00749ed1eb32834e
Author: Campbell Barton
Date:   Mon Mar 20 12:47:50 2017 +1100
Branches: app-templates
https://developer.blender.org/rB0ed06e282af5247c1bf13d9b00749ed1eb32834e

Merge branch 'master' into app-templates

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



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

diff --cc source/blender/windowmanager/intern/wm_files.c
index b4b87e2e0a,60a361122c..1fb3da34bc
--- a/source/blender/windowmanager/intern/wm_files.c
+++ b/source/blender/windowmanager/intern/wm_files.c
@@@ -1523,12 -1469,9 +1523,12 @@@ void WM_OT_read_homefile(wmOperatorTyp
  	RNA_def_property_flag(prop, PROP_HIDDEN | PROP_SKIP_SAVE);
  
  	/* So the splash can be kept open after loading a file (for templates). */
- 	prop = RNA_def_boolean(ot->srna, "use_splash", true, "Splash", "");
+ 	prop = RNA_def_boolean(ot->srna, "use_splash", false, "Splash", "");
  	RNA_def_property_flag(prop, PROP_HIDDEN | PROP_SKIP_SAVE);
  
 +	prop = RNA_def_boolean(ot->srna, "use_template", true, "Template", "");
 +	RNA_def_property_flag(prop, PROP_HIDDEN | PROP_SKIP_SAVE);
 +
  	/* omit poll to run in background mode */
  }