kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Fix part of code in load_image_single() wrongly disabled when WITH_OPENEXR was disabled.

Browse Source
This commit is contained in:
Bastien Montagne 2015-06-27 09:52:52 +02:00
parent ab85c5f980
commit e78b03f9e9
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source/blender/blenkernel/intern/image.c
View File

@ -3441,7 +3441,9 @@ static ImBuf *load_image_single(
ibuf = NULL; ibuf = NULL;
} }
} }
else { else
#endif
{
image_initialize_after_load(ima, ibuf); image_initialize_after_load(ima, ibuf);
*r_assign = true; *r_assign = true;
@ -3457,10 +3459,6 @@ static ImBuf *load_image_single(
imapf->packedfile = newPackedFile(NULL, filepath, ID_BLEND_PATH(G.main, &ima->id)); imapf->packedfile = newPackedFile(NULL, filepath, ID_BLEND_PATH(G.main, &ima->id));
} }
} }
#else
image_initialize_after_load(ima, ibuf);
*r_assign = true;
#endif
} }
else { else {
ima->ok = 0; ima->ok = 0;