Revision: 27164
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=27164
Author: campbellbarton
Date: 2010-02-27 13:01:10 +0100 (Sat, 27 Feb 2010)
Log Message:
-----------
was using wrong global flag for python script disabling in recent commit.
Modified Paths:
--------------
trunk/blender/source/blender/python/intern/bpy_driver.c
trunk/blender/source/blender/python/intern/bpy_interface.c
trunk/blender/source/blender/windowmanager/intern/wm_operators.c
Modified: trunk/blender/source/blender/python/intern/bpy_driver.c
===================================================================
--- trunk/blender/source/blender/python/intern/bpy_driver.c 2010-02-27
10:01:20 UTC (rev 27163)
+++ trunk/blender/source/blender/python/intern/bpy_driver.c 2010-02-27
12:01:10 UTC (rev 27164)
@@ -166,7 +166,7 @@
if ((expr == NULL) || (expr[0]=='\0'))
return result;
- if(!(G.fileflags & G_SCRIPT_AUTOEXEC)) {
+ if(!(G.f & G_SCRIPT_AUTOEXEC)) {
printf("skipping driver '%s', automatic scripts are
disabled\n", driver->expression);
return result;
}
Modified: trunk/blender/source/blender/python/intern/bpy_interface.c
===================================================================
--- trunk/blender/source/blender/python/intern/bpy_interface.c 2010-02-27
10:01:20 UTC (rev 27163)
+++ trunk/blender/source/blender/python/intern/bpy_interface.c 2010-02-27
12:01:10 UTC (rev 27164)
@@ -631,7 +631,7 @@
for(text=CTX_data_main(C)->text.first; text; text= text->id.next) {
if(text->flags & TXT_ISSCRIPT &&
BLI_testextensie(text->id.name+2, ".py")) {
- if(!(G.fileflags & G_SCRIPT_AUTOEXEC)) {
+ if(!(G.f & G_SCRIPT_AUTOEXEC)) {
printf("scripts disabled for \"%s\", skipping
'%s'\n", bmain->name, text->id.name+2);
}
else {
Modified: trunk/blender/source/blender/windowmanager/intern/wm_operators.c
===================================================================
--- trunk/blender/source/blender/windowmanager/intern/wm_operators.c
2010-02-27 10:01:20 UTC (rev 27163)
+++ trunk/blender/source/blender/windowmanager/intern/wm_operators.c
2010-02-27 12:01:10 UTC (rev 27164)
@@ -1357,9 +1357,9 @@
G.fileflags |= G_FILE_NO_UI;
if(RNA_boolean_get(op->ptr, "use_scripts"))
- G.fileflags |= G_SCRIPT_AUTOEXEC;
+ G.f |= G_SCRIPT_AUTOEXEC;
else
- G.fileflags &= ~G_SCRIPT_AUTOEXEC;
+ G.f &= ~G_SCRIPT_AUTOEXEC;
// XXX wm in context is not set correctly after WM_read_file -> crash
// do it before for now, but is this correct with multiple windows?
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
