[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [57384] trunk/blender: minor changes to the script auto-execution based on Brecht's suggestions.

[Campbell Barton]

Revision: 57384
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57384
Author:   campbellbarton
Date:     2013-06-12 00:10:56 +0000 (Wed, 12 Jun 2013)
Log Message:
-----------
minor changes to the script auto-execution based on Brecht's suggestions.

Modified Paths:
--------------
    trunk/blender/release/scripts/startup/bl_ui/space_info.py
    trunk/blender/source/blender/python/intern/bpy_driver.c
    trunk/blender/source/blender/python/intern/bpy_interface.c

Modified: trunk/blender/release/scripts/startup/bl_ui/space_info.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/space_info.py	2013-06-11 21:58:48 UTC (rev 57383)
+++ trunk/blender/release/scripts/startup/bl_ui/space_info.py	2013-06-12 00:10:56 UTC (rev 57384)
@@ -67,14 +67,13 @@
 
         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')
+            row.label("Auto-run disabled: %s" % bpy.app.autoexec_fail_message, icon='ERROR')
             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)
+            row.operator("script.autoexec_warn_clear", text="Ignore")
             return
 
         row.operator("wm.splash", text="", icon='BLENDER', emboss=False)

Modified: trunk/blender/source/blender/python/intern/bpy_driver.c
===================================================================
--- trunk/blender/source/blender/python/intern/bpy_driver.c	2013-06-11 21:58:48 UTC (rev 57383)
+++ trunk/blender/source/blender/python/intern/bpy_driver.c	2013-06-12 00:10:56 UTC (rev 57384)
@@ -180,7 +180,7 @@
 
 	DriverVar *dvar;
 	double result = 0.0; /* default return */
-	char *expr = NULL;
+	const char *expr;
 	short targets_ok = 1;
 	int i;
 
@@ -192,9 +192,9 @@
 	if (!(G.f & G_SCRIPT_AUTOEXEC)) {
 		if (!(G.f & G_SCRIPT_AUTOEXEC_FAIL_QUIET)) {
 			G.f |= G_SCRIPT_AUTOEXEC_FAIL;
-			BLI_snprintf(G.autoexec_fail, sizeof(G.autoexec_fail), "Driver '%s'", driver->expression);
+			BLI_snprintf(G.autoexec_fail, sizeof(G.autoexec_fail), "Driver '%s'", expr);
 
-			printf("skipping driver '%s', automatic scripts are disabled\n", driver->expression);
+			printf("skipping driver '%s', automatic scripts are disabled\n", expr);
 		}
 		return 0.0f;
 	}

Modified: trunk/blender/source/blender/python/intern/bpy_interface.c
===================================================================
--- trunk/blender/source/blender/python/intern/bpy_interface.c	2013-06-11 21:58:48 UTC (rev 57383)
+++ trunk/blender/source/blender/python/intern/bpy_interface.c	2013-06-12 00:10:56 UTC (rev 57384)
@@ -731,7 +731,7 @@
 			if (!(G.f & G_SCRIPT_AUTOEXEC)) {
 				if (!(G.f & G_SCRIPT_AUTOEXEC_FAIL_QUIET)) {
 					G.f |= G_SCRIPT_AUTOEXEC_FAIL;
-					BLI_snprintf(G.autoexec_fail, sizeof(G.autoexec_fail), "Register Text '%s'", text->id.name + 2);
+					BLI_snprintf(G.autoexec_fail, sizeof(G.autoexec_fail), "Text '%s'", text->id.name + 2);
 
 					printf("scripts disabled for \"%s\", skipping '%s'\n", bmain->name, text->id.name + 2);
 				}