[Bf-blender-cvs] [e96e0dd] master: Fix T45715: Blender crashes when creating Environment Map textures in Multi-View mode

[Dalai Felinto]

Commit: e96e0ddbee89e4ccce3e0673883625aa73cc949a
Author: Dalai Felinto
Date:   Fri Aug 7 15:46:18 2015 -0300
Branches: master
https://developer.blender.org/rBe96e0ddbee89e4ccce3e0673883625aa73cc949a

Fix T45715: Blender crashes when creating Environment Map textures in Multi-View mode

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

M	source/blender/render/intern/source/envmap.c

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

diff --git a/source/blender/render/intern/source/envmap.c b/source/blender/render/intern/source/envmap.c
index 23d021d..1e42617 100644
--- a/source/blender/render/intern/source/envmap.c
+++ b/source/blender/render/intern/source/envmap.c
@@ -498,7 +498,8 @@ static void render_envmap(Render *re, EnvMap *env)
 			float *alpha;
 			float *rect;
 
-			rect = RE_RenderLayerGetPass(rl, SCE_PASS_COMBINED, re->viewname);
+			/* envmap is rendered independently of multiview  */
+			rect = RE_RenderLayerGetPass(rl, SCE_PASS_COMBINED, "");
 			ibuf = IMB_allocImBuf(envre->rectx, envre->recty, 24, IB_rect | IB_rectfloat);
 			memcpy(ibuf->rect_float, rect, ibuf->channels * ibuf->x * ibuf->y * sizeof(float));