Commit: bf3a031e9b1de2d548b726312e334ed381cff0b8
Author: Dalai Felinto
Date: Mon Mar 16 21:32:36 2015 +0100
Branches: multiview
https://developer.blender.org/rBbf3a031e9b1de2d548b726312e334ed381cff0b8
Fix segfault (thank you ASAN) when changing number of views in compositor
===================================================================
M source/blender/blenkernel/intern/image.c
===================================================================
diff --git a/source/blender/blenkernel/intern/image.c
b/source/blender/blenkernel/intern/image.c
index 941d630..4c46691 100644
--- a/source/blender/blenkernel/intern/image.c
+++ b/source/blender/blenkernel/intern/image.c
@@ -3429,7 +3429,8 @@ static ImBuf *image_load_image_file(Image *ima, ImageUser
*iuser, int cfra)
IMB_ImBufFromStereo(ima->stereo3d_format, &ibuf_arr[0],
&ibuf_arr[1]);
/* return the original requested ImBuf */
- ibuf = ibuf_arr[(iuser ? iuser->multi_index : 0)];
+ i = MIN2(iuser ? iuser->multi_index : 0, totviews - 1);
+ ibuf = ibuf_arr[i];
if (assign) {
for (i = 0; i < totviews; i++) {
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
