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

warning fix

Browse Source
This commit is contained in:
Campbell Barton
2010-03-20 16:56:52 +00:00
parent 391cc2d004
commit 11b260ee06
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/blenloader/BLO_readfile.h
View File

@@ -205,7 +205,7 @@ int BLO_has_bfile_extension(char *str);
/* return ok when a blenderfile, in dir is the filename,
* in group the type of libdata
*/
int BLO_is_a_library(char *path, char *dir, char *group);
int BLO_is_a_library(const char *path, char *dir, char *group);
struct Main* BLO_library_append_begin(const struct bContext *C, BlendHandle** bh, char *dir);
void BLO_library_append_named_part(const struct bContext *C, struct Main *mainl, BlendHandle** bh, char *name, int idcode, short flag);

6
source/blender/blenloader/intern/readfile.c
View File

@@ -1070,7 +1070,7 @@ int BLO_has_bfile_extension(char *str)
return (BLI_testextensie(str, ".ble") || BLI_testextensie(str, ".blend")||BLI_testextensie(str, ".blend.gz"));
}
int BLO_is_a_library(char *path, char *dir, char *group)
int BLO_is_a_library(const char *path, char *dir, char *group)
{
/* return ok when a blenderfile, in dir is the filename,
* in group the type of libdata
@@ -1087,7 +1087,7 @@ int BLO_is_a_library(char *path, char *dir, char *group)
dir[len-1]= 0;
/* Find the last slash */
fd= (strrchr(dir, '/')>strrchr(dir, '\\'))?strrchr(dir, '/'):strrchr(dir, '\\');
fd= BLI_last_slash(dir);
if(fd==0) return 0;
*fd= 0;
@@ -1099,7 +1099,7 @@ int BLO_is_a_library(char *path, char *dir, char *group)
char *gp = fd+1; // in case we have a .blend file, gp points to the group
/* Find the last slash */
fd= (strrchr(dir, '/')>strrchr(dir, '\\'))?strrchr(dir, '/'):strrchr(dir, '\\');
fd= BLI_last_slash(dir);
if (!fd || !BLO_has_bfile_extension(fd+1)) return 0;
/* now we know that we are in a blend file and it is safe to