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

prevented loading of .dotfiles as an image,

Browse Source 
bugfix added for illegal avi/anim handling.
This commit is contained in:
Rob Haarsma
2003-02-09 15:16:36 +00:00
parent 0841582d0b
commit 000b0efb7d
1 changed files with 25 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
source/blender/src/imasel.c
View File

@@ -502,6 +502,21 @@ void get_next_image(SpaceImaSel *simasel)
animlen= IMB_anim_get_duration(anim);
ibuf = IMB_anim_absolute(anim, animlen / 2);
if(ibuf) {
//get icon dimensions for movie
ima->orgx = ibuf->x;
ima->orgy = ibuf->y;
// ima->orgd = ibuf->depth;
if (ima->orgx > ima->orgy){
ima->dw = 64;
ima->dh = (short)(62 * ((float)ima->orgy / (float)ima->orgx));
}else{
ima->dw = (short)(64 * ((float)ima->orgx / (float)ima->orgy));
ima->dh = 62;
}
}
IMB_free_anim(anim);
}
@@ -669,13 +684,17 @@ void get_file_info(SpaceImaSel *simasel)
strcpy(name , simasel->dir);
strcat(name , direntry->name);
if (IMB_ispic(name)) {
direntry->type = IMS_IMA;
}else{
if (IMB_isanim(name)) {
direntry->type = IMS_ANIM;
if(direntry->name[0] == '.') {
direntry->type = IMS_NOIMA;
} else {
if (IMB_ispic(name)) {
direntry->type = IMS_IMA;
}else{
direntry->type = IMS_NOIMA;
if (IMB_isanim(name)) {
direntry->type = IMS_ANIM;
}else{
direntry->type = IMS_NOIMA;
}
}
}