[Bf-blender-cvs] [a76a842] multiview: Fix crash when opened EXR image had views not present in the scene views

Dalai Felinto noreply at git.blender.org
Tue Aug 5 18:01:03 CEST 2014


Commit: a76a84225c692ed12e88b9d6729c4336a0df4034
Author: Dalai Felinto
Date:   Tue Aug 5 18:00:39 2014 +0200
Branches: multiview
https://developer.blender.org/rBa76a84225c692ed12e88b9d6729c4336a0df4034

Fix crash when opened EXR image had views not present in the scene views

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

M	source/blender/editors/space_image/image_ops.c

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

diff --git a/source/blender/editors/space_image/image_ops.c b/source/blender/editors/space_image/image_ops.c
index dbc7b9f..9692561 100644
--- a/source/blender/editors/space_image/image_ops.c
+++ b/source/blender/editors/space_image/image_ops.c
@@ -1640,15 +1640,17 @@ static bool save_image_doit(bContext *C, SpaceImage *sima, wmOperator *op, SaveI
 
 			ED_space_image_release_buffer(sima, ibuf, lock);
 
-			for (i=0, rv = (RenderView *)rr->views.first; rv; rv = rv->next, i++) {
+			for (i = 0, rv = (RenderView *)rr->views.first; rv; rv = rv->next, i++) {
 				sima->iuser.pass = get_multiview_pass_id(rr, &sima->iuser, i);
 				sima->iuser.view = i;
 				sima->iuser.flag &= ~IMA_SHOW_STEREO;
 				BKE_image_multilayer_index(rr, &sima->iuser);
 
 				srv = BLI_findstring(&scene->r.views, rv->name, offsetof(SceneRenderView, name));
-
-				BLI_strncpy(suffix, srv->suffix, sizeof(suffix));
+				if (srv)
+					BLI_strncpy(suffix, srv->suffix, sizeof(suffix));
+				else
+					BLI_strncpy(suffix, rv->name, sizeof(suffix));
 
 				BLI_strncpy(filepath, simopts->filepath, sizeof(filepath));
 				BLI_path_view(filepath, suffix);




More information about the Bf-blender-cvs mailing list