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
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2011-04-24 18:45:49 +0400
committerCampbell Barton <ideasman42@gmail.com>2011-04-24 18:45:49 +0400
commitfd45310dfe30952081ef51f80e62543664ca84a5 (patch)
tree1c9babdc970a69ce1ebc569904ddd7f6c893295f /source/blender/blenloader/intern/readblenentry.c
parent8fdebf24f4fe405c77f13a72c45cf0f8e6bc1f3f (diff)
fix crash [#27158] Appending crash with preview.
Diffstat (limited to 'source/blender/blenloader/intern/readblenentry.c')
-rw-r--r--source/blender/blenloader/intern/readblenentry.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/source/blender/blenloader/intern/readblenentry.c b/source/blender/blenloader/intern/readblenentry.c
index ae4ba6629a6..abc469a5355 100644
--- a/source/blender/blenloader/intern/readblenentry.c
+++ b/source/blender/blenloader/intern/readblenentry.c
@@ -144,7 +144,7 @@ LinkNode *BLO_blendhandle_get_datablock_names(BlendHandle *bh, int ofblocktype,
return names;
}
-LinkNode *BLO_blendhandle_get_previews(BlendHandle *bh, int ofblocktype)
+LinkNode *BLO_blendhandle_get_previews(BlendHandle *bh, int ofblocktype, int *tot_prev)
{
FileData *fd= (FileData*) bh;
LinkNode *previews= NULL;
@@ -153,6 +153,7 @@ LinkNode *BLO_blendhandle_get_previews(BlendHandle *bh, int ofblocktype)
int npreviews = 0;
PreviewImage* prv = NULL;
PreviewImage* new_prv = NULL;
+ int tot= 0;
for (bhead= blo_firstbhead(fd); bhead; bhead= blo_nextbhead(fd, bhead)) {
if (bhead->code==ofblocktype) {
@@ -166,6 +167,7 @@ LinkNode *BLO_blendhandle_get_previews(BlendHandle *bh, int ofblocktype)
case ID_LA: /* fall through */
new_prv = MEM_callocN(sizeof(PreviewImage), "newpreview");
BLI_linklist_prepend(&previews, new_prv);
+ tot++;
looking = 1;
break;
default:
@@ -213,7 +215,8 @@ LinkNode *BLO_blendhandle_get_previews(BlendHandle *bh, int ofblocktype)
}
}
-
+
+ *tot_prev= tot;
return previews;
}