[Bf-blender-cvs] [2d96666] master: Fix for factory settings loading without UI

[Campbell Barton]

Commit: 2d96666a71e2fbd04b3608a6344f0dbc656cc95c
Author: Campbell Barton
Date:   Thu Nov 12 21:52:25 2015 +1100
Branches: master
https://developer.blender.org/rB2d96666a71e2fbd04b3608a6344f0dbc656cc95c

Fix for factory settings loading without UI

When load-ui was disabled, resetting factory settings kept existing UI too.

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

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 e87be23..86da2ef 100644
--- a/source/blender/windowmanager/intern/wm_files.c
+++ b/source/blender/windowmanager/intern/wm_files.c
@@ -768,6 +768,10 @@ int wm_homefile_read_exec(bContext *C, wmOperator *op)
 			}
 		}
 	}
+	else {
+		/* always load UI for factory settings (prefs will re-init) */
+		G.fileflags &= ~G_FILE_NO_UI;
+	}
 
 	return wm_homefile_read(C, op->reports, from_memory, filepath) ? OPERATOR_FINISHED : OPERATOR_CANCELLED;
 }