kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

BPython - two small fixes:

Browse Source 
-- search/remove '\r' from string buffers read from scripts:
    used a fast way: change each '\r' to a space, since it should
    work for scripts and the buffer is only needed for a short while.
-- added call to clear error indicator before running a script.
    A previous script may set it even on succesful returns.
This commit is contained in:
Willian Padovani Germano 2004-01-27 09:30:29 +00:00
parent 898001a2b6
commit 36bd6379c2
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
source/blender/python/BPY_interface.c
View File

@ -396,6 +396,8 @@ int BPY_txt_do_python(struct SpaceText* st)
if (!st->text) return 0;
PyErr_Clear();
/* check if this text is already running */
while (script) {
if (!strcmp(script->id.name+2, st->text->id.name+2)) {
@ -476,7 +478,7 @@ int BPY_menu_do_python(short menutype, int event)
BPyMenu *pym;
BPySubMenu *pysm;
FILE *fp = NULL;
char *buffer;
char *buffer, *s;
char filestr[FILE_MAXDIR+FILE_MAXFILE];
char dirname[FILE_MAXDIR];
Script *script = G.main->script.first;
@ -486,6 +488,8 @@ int BPY_menu_do_python(short menutype, int event)
if (!pym) return 0;
PyErr_Clear();
if (pym->version > G.version)
notice ("Version mismatch: script was written for Blender %d. "
"It may fail with yours: %d.", pym->version, G.version);
@ -523,8 +527,8 @@ int BPY_menu_do_python(short menutype, int event)
BLI_make_file_string("/", filestr, dirname, pym->filename);
}
fp = fopen(filestr, "r");
if (!fp) { /* later also support userhome/.blender/scripts/ or whatever */
fp = fopen(filestr, "rb");
if (!fp) {
printf("Error loading script: couldn't open file %s\n", filestr);
return 0;
}
@ -572,6 +576,9 @@ int BPY_menu_do_python(short menutype, int event)
buffer[len] = '\0';
/* fast clean-up of dos lines */
for (s = buffer; *s != '\0'; s++) if (*s == '\r') *s = ' ';
fclose(fp);
/* run the string buffer */