forked from bartvdbraak/blender
Fix part of code in load_image_single()
wrongly disabled when WITH_OPENEXR was disabled.
This commit is contained in:
parent
ab85c5f980
commit
e78b03f9e9
@ -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;
|
||||||
|
Loading…
Reference in New Issue
Block a user