griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

=== bugfix ===

Browse Source 
[ #6077 ] Scripts in sub-sub-folders of Blender's scripts folder won't run.
[ #5572 ] Scripts in sub-folders of Blender's scripts folder won't run
- I've added a function in blenlib to join two strings with a path separator in between.
- Willian, Campbell, please check if commit in BPY_menus is ok and test - thanks!
This commit is contained in:
Andrea Weikert
2007-02-28 21:37:14 +00:00
parent a734d3cc27
commit c7ad7cd1b0
3 changed files with 23 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -865,14 +865,8 @@ static int bpymenu_ParseDir(char *dirname, char *parentdir, int is_userdir )
s = de->d_name;
if (parentdir) {
/* Join parentdir and de->d_name */
short a = strlen(parentdir);
strcpy(subdir, parentdir);
strcpy(subdir + a+1, de->d_name);
#ifdef WIN32
subdir[a] = '\\';
#else
subdir[a] = '/';
#endif
BLI_join_dirfile(subdir, parentdir, de->d_name);
s = subdir;
}
bpymenu_ParseFile(file, s, is_userdir);
@@ -905,7 +899,8 @@ static int bpymenu_ParseDir(char *dirname, char *parentdir, int is_userdir )
}
s = de->d_name;
if (parentdir) {
BLI_make_file_string(NULL, subdir, parentdir, de->d_name);
/* Join parentdir and de->d_name */
BLI_join_dirfile(subdir, parentdir, de->d_name);
s = subdir;
}
if (bpymenu_ParseDir(path, s, is_userdir) == -1) {