[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [47533] branches/soc-2012-bratwurst/source /blender/windowmanager/intern/wm_files.c: Tweak for the previous patch.

[Jorge Rodriguez]

Revision: 47533
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47533
Author:   vino
Date:     2012-06-06 18:55:44 +0000 (Wed, 06 Jun 2012)
Log Message:
-----------
Tweak for the previous patch. Loading factory settings should load userprefs as well.

Modified Paths:
--------------
    branches/soc-2012-bratwurst/source/blender/windowmanager/intern/wm_files.c

Modified: branches/soc-2012-bratwurst/source/blender/windowmanager/intern/wm_files.c
===================================================================
--- branches/soc-2012-bratwurst/source/blender/windowmanager/intern/wm_files.c	2012-06-06 18:38:01 UTC (rev 47532)
+++ branches/soc-2012-bratwurst/source/blender/windowmanager/intern/wm_files.c	2012-06-06 18:55:44 UTC (rev 47533)
@@ -542,7 +542,7 @@
 	G.fileflags &= ~G_FILE_NO_UI;
 
 	/* If preferences have already been loaded, don't load again. */
-	if (U.themes.first == NULL)
+	if (U.themes.first == NULL || from_memory)
 	{
 		G.fileflags |= G_FILE_PREFERENCES;
 		loaded_preferences = 1;