diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2010-02-27 04:47:46 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2010-02-27 04:47:46 +0300 |
| commit | 15db857628198195936b80115329b8356645ea68 (patch) | |
| tree | bc60dac34a5c662d72b9fffed45b92d0b645f73e /source/blender/python | |
| parent | 4e931482f48feab644b74308be92c385b8ebf3ec (diff) | |
rename flag for auto script execution since scriptlinks are no more.
Diffstat (limited to 'source/blender/python')
| -rw-r--r-- | source/blender/python/intern/bpy_driver.c | 6 | ||||
| -rw-r--r-- | source/blender/python/intern/bpy_interface.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/python/intern/bpy_driver.c b/source/blender/python/intern/bpy_driver.c index 24b8c0dc522..a4a28ec53d2 100644 --- a/source/blender/python/intern/bpy_driver.c +++ b/source/blender/python/intern/bpy_driver.c @@ -87,7 +87,7 @@ static int bpy_pydriver_create_dict(void) /* If there's a Blender text called pydrivers.py, import it. * Users can add their own functions to this module. */ - if (G.f & G_DOSCRIPTLINKS) { + if (G.f & G_SCRIPT_AUTOEXEC) { mod = importText("pydrivers"); /* can also use PyImport_Import() */ if (mod) { PyDict_SetItemString(d, "pydrivers", mod); @@ -159,14 +159,14 @@ float BPY_pydriver_eval (ChannelDriver *driver) int i; /* sanity checks - should driver be executed? */ - /*if (G.f & G_DOSCRIPTLINKS)==0) return result; */ + /*if (G.f & G_SCRIPT_AUTOEXEC)==0) return result; */ /* get the py expression to be evaluated */ expr = driver->expression; if ((expr == NULL) || (expr[0]=='\0')) return result; - if(!(G.fileflags & G_DOSCRIPTLINKS)) { + if(!(G.fileflags & G_SCRIPT_AUTOEXEC)) { printf("skipping driver '%s', automatic scripts are disabled\n", driver->expression); return result; } diff --git a/source/blender/python/intern/bpy_interface.c b/source/blender/python/intern/bpy_interface.c index 4ad06e83e9f..db31bd01a7a 100644 --- a/source/blender/python/intern/bpy_interface.c +++ b/source/blender/python/intern/bpy_interface.c @@ -631,7 +631,7 @@ void BPY_load_user_modules(bContext *C) 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_DOSCRIPTLINKS)) { + if(!(G.fileflags & G_SCRIPT_AUTOEXEC)) { printf("scripts disabled for \"%s\", skipping '%s'\n", bmain->name, text->id.name+2); } else { |