[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [57328] trunk/blender: minor edit to previous commit, only show option to reload the file if its been saved.
Campbell Barton
ideasman42 at gmail.com
Mon Jun 10 04:05:40 CEST 2013
Revision: 57328
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57328
Author: campbellbarton
Date: 2013-06-10 02:05:38 +0000 (Mon, 10 Jun 2013)
Log Message:
-----------
minor edit to previous commit, only show option to reload the file if its been saved.
Modified Paths:
--------------
trunk/blender/release/scripts/startup/bl_ui/space_info.py
trunk/blender/source/blender/windowmanager/intern/wm_files.c
Modified: trunk/blender/release/scripts/startup/bl_ui/space_info.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/space_info.py 2013-06-10 00:42:16 UTC (rev 57327)
+++ trunk/blender/release/scripts/startup/bl_ui/space_info.py 2013-06-10 02:05:38 UTC (rev 57328)
@@ -68,9 +68,11 @@
if bpy.app.autoexec_fail is True and bpy.app.autoexec_fail_quiet is False:
layout.operator_context = 'EXEC_DEFAULT'
row.label("Script failed to auto-run", icon='ERROR')
- props = row.operator("wm.open_mainfile", icon='SCREEN_BACK', text="Reload Trusted")
- props.filepath = bpy.data.filepath
- props.use_scripts = True
+ if bpy.data.is_saved:
+ props = row.operator("wm.open_mainfile", icon='SCREEN_BACK', text="Reload Trusted")
+ props.filepath = bpy.data.filepath
+ props.use_scripts = True
+
row.operator("script.autoexec_warn_clear", icon='CANCEL')
row.label("Skipping: (%s)" % bpy.app.autoexec_fail_message)
return
Modified: trunk/blender/source/blender/windowmanager/intern/wm_files.c
===================================================================
--- trunk/blender/source/blender/windowmanager/intern/wm_files.c 2013-06-10 00:42:16 UTC (rev 57327)
+++ trunk/blender/source/blender/windowmanager/intern/wm_files.c 2013-06-10 02:05:38 UTC (rev 57328)
@@ -327,7 +327,7 @@
/* make sure we're not trying to read a directory.... */
len = strlen(name);
- if (ELEM(name[len - 1], '/', '\\')) {
+ if (len > 0 && ELEM(name[len - 1], '/', '\\')) {
retval = BKE_READ_EXOTIC_FAIL_PATH;
}
else {
More information about the Bf-blender-cvs
mailing list