Merged changes in the trunk up to revision 26719.

This commit is contained in:
2010-02-08 21:13:33 +00:00
154 changed files with 2400 additions and 1227 deletions

View File

@@ -455,11 +455,11 @@ int BPY_run_python_script( bContext *C, const char *fn, struct Text *text, struc
fclose(fp);
pystring= malloc(strlen(fn) + 32);
pystring= MEM_mallocN(strlen(fn) + 32, "pystring");
pystring[0]= '\0';
sprintf(pystring, "exec(open(r'%s').read())", fn);
py_result = PyRun_String( pystring, Py_file_input, py_dict, py_dict );
free(pystring);
MEM_freeN(pystring);
#else
py_result = PyRun_File(fp, fn, Py_file_input, py_dict, py_dict);
fclose(fp);