From e78b03f9e9bb8aaba7c02c9f5d26a85ddfe2079c Mon Sep 17 00:00:00 2001 From: Bastien Montagne Date: Sat, 27 Jun 2015 09:52:52 +0200 Subject: Fix part of code in `load_image_single()` wrongly disabled when WITH_OPENEXR was disabled. --- source/blender/blenkernel/intern/image.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/source/blender/blenkernel/intern/image.c b/source/blender/blenkernel/intern/image.c index 3cc5905e763..45ae390a5e9 100644 --- a/source/blender/blenkernel/intern/image.c +++ b/source/blender/blenkernel/intern/image.c @@ -3441,7 +3441,9 @@ static ImBuf *load_image_single( ibuf = NULL; } } - else { + else +#endif + { image_initialize_after_load(ima, ibuf); *r_assign = true; @@ -3457,10 +3459,6 @@ static ImBuf *load_image_single( imapf->packedfile = newPackedFile(NULL, filepath, ID_BLEND_PATH(G.main, &ima->id)); } } -#else - image_initialize_after_load(ima, ibuf); - *r_assign = true; -#endif } else { ima->ok = 0; -- cgit v1.2.3