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

added BLI_convertstringcwd, used so command line blendfiles and python scripts can be relative to the current path.

Browse Source 
- was alredy doing this for blendfiles, but better to have in its own function.

header_text.c - renamed PATH_MAX, was defined by system includes.
This commit is contained in:
Campbell Barton
2008-09-15 01:32:53 +00:00
parent 2c31cc4503
commit ac86c04401
6 changed files with 71 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/python/BPY_extern.h
View File

@@ -94,7 +94,7 @@ extern "C" {
int BPY_menu_do_python( short menutype, int event );
int BPY_menu_do_shortcut( short menutype, unsigned short key, unsigned short modifiers );
int BPY_menu_invoke( struct BPyMenu *pym, short menutype );
void BPY_run_python_script( char *filename );
void BPY_run_python_script( const char *filename );
int BPY_run_script(struct Script *script);
void BPY_free_compiled_text( struct Text *text );

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

@@ -720,13 +720,23 @@ int BPY_txt_do_python_Text( struct Text *text )
* automatically. The script can be a file or a Blender Text in the current
* .blend.
****************************************************************************/
void BPY_run_python_script( char *fn )
void BPY_run_python_script( const char *fn )
{
char filename[FILE_MAXDIR + FILE_MAXFILE];
Text *text = NULL;
int is_blender_text = 0;
if (!BLI_exists(fn)) { /* if there's no such filename ... */
text = G.main->text.first; /* try an already existing Blender Text */
BLI_strncpy(filename, fn, FILE_MAXDIR + FILE_MAXFILE);
if (!BLI_exists(filename))
BLI_convertstringcwd(filename);
if (!BLI_exists(filename)) { /* if there's no such filename ... */
/* try an already existing Blender Text.
* use 'fn' rather then filename for this since were looking for
* internal text
*/
text = G.main->text.first;
while (text) {
if (!strcmp(fn, text->id.name + 2)) break;
@@ -741,11 +751,14 @@ void BPY_run_python_script( char *fn )
}
else {
text = add_text(fn);
/* use filename here since we know it exists,
* 'fn' may have been a relative path
*/
text = add_text(filename);
if (text == NULL) {
printf("\nError in BPY_run_python_script:\n"
"couldn't create Blender text from %s\n", fn);
"couldn't create Blender text from \"%s\"\n", filename);
/* Chris: On Windows if I continue I just get a segmentation
* violation. To get a baseline file I exit here. */
exit(2);
@@ -762,13 +775,8 @@ void BPY_run_python_script( char *fn )
/* We can't simply free the text, since the script might have called
* Blender.Load() to load a new .blend, freeing previous data.
* So we check if the pointer is still valid. */
Text *txtptr = G.main->text.first;
while (txtptr) {
if (txtptr == text) {
free_libblock(&G.main->text, text);
break;
}
txtptr = txtptr->id.next;
if (BLI_findindex(&G.main->text, text) != -1) {
free_libblock(&G.main->text, text);
}
}
}