Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDalai Felinto <dfelinto@gmail.com>2015-08-07 21:46:18 +0300
committerDalai Felinto <dfelinto@gmail.com>2015-08-07 21:46:18 +0300
commite96e0ddbee89e4ccce3e0673883625aa73cc949a (patch)
treeaa52d6587ad4e919c31554dcf0df8cd156ec37d7 /source/blender/render
parent58133d4ab27ed4e96bacbd4196311f9893530984 (diff)
Fix T45715: Blender crashes when creating Environment Map textures in Multi-View mode
Diffstat (limited to 'source/blender/render')
-rw-r--r--source/blender/render/intern/source/envmap.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/render/intern/source/envmap.c b/source/blender/render/intern/source/envmap.c
index 23d021db848..1e42617d742 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));