[Bf-blender-cvs] [d0b3faaf1e] app-templates: Don't search for missing properties on loading factory settings

[Campbell Barton]

Commit: d0b3faaf1eed3fee0f13365a7efa10bb392f3462
Author: Campbell Barton
Date:   Thu Mar 16 22:50:40 2017 +1100
Branches: app-templates
https://developer.blender.org/rBd0b3faaf1eed3fee0f13365a7efa10bb392f3462

Don't search for missing properties on loading factory settings

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

M	source/blender/windowmanager/intern/wm_files.c

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

diff --git a/source/blender/windowmanager/intern/wm_files.c b/source/blender/windowmanager/intern/wm_files.c
index 7e621184a4..f52d338364 100644
--- a/source/blender/windowmanager/intern/wm_files.c
+++ b/source/blender/windowmanager/intern/wm_files.c
@@ -1453,15 +1453,16 @@ static int wm_homefile_read_exec(bContext *C, wmOperator *op)
 		G.fileflags &= ~G_FILE_NO_UI;
 	}
 
-	bool is_app_template = RNA_boolean_get(op->ptr, "use_template");
 	char app_template[sizeof(U.app_template)] = "";
+	const bool is_app_template = !from_memory && RNA_boolean_get(op->ptr, "use_template");
+	const bool use_splash = !from_memory && RNA_boolean_get(op->ptr, "use_splash");
 
 	if (filepath != NULL) {
 		wm_file_template_from_path(app_template, filepath);
 	}
 
 	if (wm_homefile_read(C, op->reports, from_memory, filepath, is_app_template ? app_template : NULL)) {
-		if (RNA_boolean_get(op->ptr, "use_splash")) {
+		if (use_splash) {
 			WM_init_splash(C);
 		}
 		return OPERATOR_FINISHED;