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

== BPy: scripts in menus ==

Browse Source 
Fixing compile warning (about a var that was always true being used as condition in an "if" block).
This commit is contained in:
Willian Padovani Germano
2008-02-10 02:12:06 +00:00
parent c691979370
commit 34ddfb03c1
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -457,6 +457,7 @@ static int bpymenu_CreateFromFile( void )
{ {
FILE *fp; FILE *fp;
char line[255], w1[255], w2[255], tooltip[255], *tip; char line[255], w1[255], w2[255], tooltip[255], *tip;
char upythondir[FILE_MAXDIR];
char *homedir = NULL; char *homedir = NULL;
int parsing, version, is_userdir; int parsing, version, is_userdir;
short group; short group;
@@ -492,15 +493,14 @@ static int bpymenu_CreateFromFile( void )
* current one. If so, return to force updating from dirs */ * current one. If so, return to force updating from dirs */
w1[0] = '\0'; w1[0] = '\0';
fscanf( fp, "# User defined scripts dir: %[^\n]\n", w1 ); fscanf( fp, "# User defined scripts dir: %[^\n]\n", w1 );
if( w1 ) {
char upythondir[FILE_MAXDIR];
BLI_strncpy(upythondir, U.pythondir, FILE_MAXDIR); BLI_strncpy(upythondir, U.pythondir, FILE_MAXDIR);
BLI_convertstringcode(upythondir, G.sce, 0); BLI_convertstringcode(upythondir, G.sce, 0);
if( strcmp( w1, upythondir ) != 0 )
return -1; if( strcmp( w1, upythondir ) != 0 )
w1[0] = '\0'; return -1;
}
w1[0] = '\0';
while( fgets( line, 255, fp ) ) { /* parsing file lines */ while( fgets( line, 255, fp ) ) { /* parsing file lines */