Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/source
diff options
context:
space:
mode:
authorRob Haarsma <phaseIV@zonnet.nl>2003-02-09 15:47:43 +0300
committerRob Haarsma <phaseIV@zonnet.nl>2003-02-09 15:47:43 +0300
commit0841582d0b7759442aa5667dc91ea7102c80fc07 (patch)
tree35b7ba733b8402643dbbeb49ae027436a2035ff2 /source
parentaaa47ced530f3210bdd6c07fbbc3cc7ead04364c (diff)
disabled loading of bmp files :(
Diffstat (limited to 'source')
-rw-r--r--source/blender/imbuf/intern/util.c6
-rw-r--r--source/blender/src/filesel.c2
2 files changed, 5 insertions, 3 deletions
diff --git a/source/blender/imbuf/intern/util.c b/source/blender/imbuf/intern/util.c
index e1abc273076..8f9c35532f8 100644
--- a/source/blender/imbuf/intern/util.c
+++ b/source/blender/imbuf/intern/util.c
@@ -56,13 +56,13 @@
int IMB_ispic(char *name)
{
struct stat st;
- int fp, buf[16];
+ int fp, buf[10];
int ofs = 0;
if (ib_stat(name,&st) == -1) return(0);
if (((st.st_mode) & S_IFMT) == S_IFREG){
if ((fp = open(name,O_BINARY|O_RDONLY)) >= 0){
- if (read(fp,buf,64)==64){
+ if (read(fp,buf,32)==32){
close(fp);
if (buf[ofs] == CAT) ofs += 3;
if (buf[ofs] == FORM){
@@ -86,7 +86,9 @@ int IMB_ispic(char *name)
}
if (imb_is_a_png(buf)) return(PNG);
if (imb_is_a_targa(buf)) return(TGA);
+/*
if (imb_is_a_bmp(buf)) return(BMP);
+*/
return(FALSE);
}
close(fp);
diff --git a/source/blender/src/filesel.c b/source/blender/src/filesel.c
index 81ebf222202..34e0ea8d68c 100644
--- a/source/blender/src/filesel.c
+++ b/source/blender/src/filesel.c
@@ -508,7 +508,7 @@ void test_flags_file(SpaceFile *sfile)
BLI_testextensie(file->relname, ".tga") ||
BLI_testextensie(file->relname, ".rgb") ||
BLI_testextensie(file->relname, ".png") ||
- BLI_testextensie(file->relname, ".bmp") ||
+/* BLI_testextensie(file->relname, ".bmp") || */
BLI_testextensie(file->relname, ".iff") ||
BLI_testextensie(file->relname, ".lbm") ||
BLI_testextensie(file->relname, ".sgi")) {