[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [24839] trunk/blender/source/blender/ windowmanager/intern/wm_operators.c: 2.5 bugfix: splash would crash when . Blog contained file names without a

Brecht Van Lommel brecht at blender.org
Mon Nov 23 21:06:10 CET 2009


Revision: 24839
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=24839
Author:   blendix
Date:     2009-11-23 21:06:09 +0100 (Mon, 23 Nov 2009)

Log Message:
-----------
2.5 bugfix: splash would crash when .Blog contained file names without a
slash in them. Also removed the ctrl+alt+f1 shortcut key, was for testing.

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

Modified: trunk/blender/source/blender/windowmanager/intern/wm_operators.c
===================================================================
--- trunk/blender/source/blender/windowmanager/intern/wm_operators.c	2009-11-23 19:59:42 UTC (rev 24838)
+++ trunk/blender/source/blender/windowmanager/intern/wm_operators.c	2009-11-23 20:06:09 UTC (rev 24839)
@@ -1126,7 +1126,9 @@
 		tmp.value= i+1;
 		tmp.icon= ICON_FILE_BLEND;
 		tmp.identifier= recent->filename;
-		tmp.name= BLI_last_slash(recent->filename)+1;
+		tmp.name= BLI_last_slash(recent->filename);
+		if(tmp.name) tmp.name += 1;
+		else tmp.name = recent->filename;
 		RNA_enum_item_add(&item, &totitem, &tmp);
 	}
 	
@@ -2732,7 +2734,6 @@
 	/* debug/testing */
 	WM_keymap_verify_item(keymap, "WM_OT_redraw_timer", TKEY, KM_PRESS, KM_ALT|KM_CTRL, 0);
 	WM_keymap_verify_item(keymap, "WM_OT_debug_menu", DKEY, KM_PRESS, KM_ALT|KM_CTRL, 0);
-	WM_keymap_verify_item(keymap, "WM_OT_splash", F1KEY, KM_PRESS, KM_ALT|KM_CTRL, 0);
 	WM_keymap_verify_item(keymap, "WM_OT_search_menu", SPACEKEY, KM_PRESS, 0, 0);
 	
 	/* Space switching */





More information about the Bf-blender-cvs mailing list