archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

include the blendfile name when executing python scripts, so when using libraries you can tell where the script is stored which raises an error.

Browse Source
This commit is contained in:
Campbell Barton
2010-06-02 14:40:58 +00:00
parent ad25ac9e9b
commit b1a96f76dc
3 changed files with 22 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
source/blender/python/intern/bpy_interface.c
View File

@@ -327,16 +327,17 @@ int BPY_run_python_script( bContext *C, const char *fn, struct Text *text, struc
}
bpy_context_set(C, &gilstate);
py_dict = CreateGlobalDictionary(C, text?text->id.name+2:fn);
if (text) {
char fn_dummy[FILE_MAXDIR];
bpy_text_filename_get(fn_dummy, text);
py_dict = CreateGlobalDictionary(C, fn_dummy);
if( !text->compiled ) { /* if it wasn't already compiled, do it now */
char *buf = txt_to_buf( text );
text->compiled =
Py_CompileString( buf, text->id.name+2, Py_file_input );
Py_CompileString( buf, fn_dummy, Py_file_input );
MEM_freeN( buf );
@@ -347,7 +348,10 @@ int BPY_run_python_script( bContext *C, const char *fn, struct Text *text, struc
if(text->compiled)
py_result = PyEval_EvalCode( text->compiled, py_dict, py_dict );
} else {
}
else {
py_dict = CreateGlobalDictionary(C, fn);
FILE *fp= fopen(fn, "r");
if(fp) {
#ifdef _WIN32