Commit: 04a96356868fa8cbd712ebf310943f047ffe619d
Author: Campbell Barton
Date: Tue Mar 17 19:06:04 2015 +1100
Branches: multiview
https://developer.blender.org/rB04a96356868fa8cbd712ebf310943f047ffe619d
Support for building without EXR
===================================================================
M source/blender/blenkernel/intern/image.c
===================================================================
diff --git a/source/blender/blenkernel/intern/image.c
b/source/blender/blenkernel/intern/image.c
index 7be2669..ca8689d 100644
--- a/source/blender/blenkernel/intern/image.c
+++ b/source/blender/blenkernel/intern/image.c
@@ -3345,6 +3345,7 @@ static ImBuf *load_image_single(Image *ima, ImageUser
*iuser, int cfra,
}
if (ibuf) {
+#ifdef WITH_OPENEXR
if (ibuf->ftype == OPENEXR && ibuf->userdata) {
if (IMB_exr_has_singlelayer_multiview(ibuf->userdata)) {
/* handle singlelayer multiview case assign
ibuf based on available views */
@@ -3376,6 +3377,10 @@ static ImBuf *load_image_single(Image *ima, ImageUser
*iuser, int cfra,
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;
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
