[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [32248] trunk/blender/source/blender/ windowmanager/intern: Fix #24098: new file and load factory settings sharing same hotkey.

[Brecht Van Lommel]

Revision: 32248
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=32248
Author:   blendix
Date:     2010-10-02 15:45:26 +0200 (Sat, 02 Oct 2010)

Log Message:
-----------
Fix #24098: new file and load factory settings sharing same hotkey.
Made these separate operators now, less confusing.

Modified Paths:
--------------
    trunk/blender/source/blender/windowmanager/intern/wm_files.c
    trunk/blender/source/blender/windowmanager/intern/wm_operators.c

Modified: trunk/blender/source/blender/windowmanager/intern/wm_files.c
===================================================================
--- trunk/blender/source/blender/windowmanager/intern/wm_files.c	2010-10-02 11:39:11 UTC (rev 32247)
+++ trunk/blender/source/blender/windowmanager/intern/wm_files.c	2010-10-02 13:45:26 UTC (rev 32248)
@@ -343,7 +343,7 @@
 {
 	ListBase wmbase;
 	char tstr[FILE_MAXDIR+FILE_MAXFILE], scestr[FILE_MAXDIR];
-	int from_memory= op?RNA_boolean_get(op->ptr, "factory"):0;
+	int from_memory= op && strcmp(op->type->idname, "WM_OT_read_factory_settings")==0;
 	int success;
 	
 	free_ttfont(); /* still weird... what does it here? */

Modified: trunk/blender/source/blender/windowmanager/intern/wm_operators.c
===================================================================
--- trunk/blender/source/blender/windowmanager/intern/wm_operators.c	2010-10-02 11:39:11 UTC (rev 32247)
+++ trunk/blender/source/blender/windowmanager/intern/wm_operators.c	2010-10-02 13:45:26 UTC (rev 32248)
@@ -1416,8 +1416,17 @@
 	ot->invoke= WM_operator_confirm;
 	ot->exec= WM_read_homefile;
 	ot->poll= WM_operator_winactive;
+}
+
+static void WM_OT_read_factory_settings(wmOperatorType *ot)
+{
+	ot->name= "Load Factory Settings";
+	ot->idname= "WM_OT_read_factory_settings";
+	ot->description="Load default file and user preferences";
 	
-	RNA_def_boolean(ot->srna, "factory", 0, "Factory Settings", "");
+	ot->invoke= WM_operator_confirm;
+	ot->exec= WM_read_homefile;
+	ot->poll= WM_operator_winactive;
 }
 
 /* *************** open file **************** */
@@ -3059,6 +3068,7 @@
 {
 	WM_operatortype_append(WM_OT_window_duplicate);
 	WM_operatortype_append(WM_OT_read_homefile);
+	WM_operatortype_append(WM_OT_read_factory_settings);
 	WM_operatortype_append(WM_OT_save_homefile);
 	WM_operatortype_append(WM_OT_window_fullscreen_toggle);
 	WM_operatortype_append(WM_OT_exit_blender);