[Bf-blender-cvs] [e6a45d8] multiview: Fallback to the zero ibuf, not the last one

Dalai Felinto noreply at git.blender.org
Tue Mar 17 15:18:32 CET 2015


Commit: e6a45d88d8b4a985d654a106787b8f904e0ac9ea
Author: Dalai Felinto
Date:   Tue Mar 17 11:05:10 2015 +0100
Branches: multiview
https://developer.blender.org/rBe6a45d88d8b4a985d654a106787b8f904e0ac9ea

Fallback to the zero ibuf, not the last one

===================================================================

M	source/blender/blenkernel/intern/image.c

===================================================================

diff --git a/source/blender/blenkernel/intern/image.c b/source/blender/blenkernel/intern/image.c
index ed5ad24..9571403 100644
--- a/source/blender/blenkernel/intern/image.c
+++ b/source/blender/blenkernel/intern/image.c
@@ -3432,7 +3432,7 @@ static ImBuf *image_load_image_file(Image *ima, ImageUser *iuser, int cfra)
 			IMB_ImBufFromStereo(ima->stereo3d_format, ibuf_arr[0], &ibuf_arr[0], &ibuf_arr[1]);
 
 		/* return the original requested ImBuf */
-		i = MIN2(iuser ? iuser->multi_index : 0, totviews - 1);
+		i = iuser && iuser->multi_index < totviews ? iuser->multi_index : 0;
 		ibuf = ibuf_arr[i];
 
 		if (assign) {




More information about the Bf-blender-cvs mailing list