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>2015-06-08 11:21:27 +0300
committerCampbell Barton <ideasman42@gmail.com>2015-06-08 11:21:54 +0300
commit7c5944137e8bbb7a52b2fa227fc49c62ac5a5edc (patch)
treebc2fedf546f87492e5e7f6c91be2e837af72a0d3
parentb54e95a5c8dcb7eae1059af107a7cdfa028d7e2e (diff)
Fix T44995: Crash loading packed image
-rw-r--r--source/blender/blenkernel/intern/image.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/image.c b/source/blender/blenkernel/intern/image.c
index a8c562029b6..09934c872f7 100644
--- a/source/blender/blenkernel/intern/image.c
+++ b/source/blender/blenkernel/intern/image.c
@@ -3394,9 +3394,11 @@ static ImBuf *load_image_single(
flag |= imbuf_alpha_flags_for_image(ima);
imapf = BLI_findlink(&ima->packedfiles, view_id);
- ibuf = IMB_ibImageFromMemory(
- (unsigned char *)imapf->packedfile->data, imapf->packedfile->size, flag,
- ima->colorspace_settings.name, "<packed data>");
+ if (imapf->packedfile) {
+ ibuf = IMB_ibImageFromMemory(
+ (unsigned char *)imapf->packedfile->data, imapf->packedfile->size, flag,
+ ima->colorspace_settings.name, "<packed data>");
+ }
}
else {
ImageUser iuser_t;