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:
authorBrecht Van Lommel <brechtvanlommel@gmail.com>2016-02-18 00:18:45 +0300
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2016-02-18 00:46:11 +0300
commitd40a24a037eae679ac2bdfc5151625ba485ef375 (patch)
treeb8804a41f0ff9a7218f88e14cf076bac17207b1d /source/blender/render/intern/source/convertblender.c
parent0eb54bd2266d2c8157342892a0c186dfefe7f5dc (diff)
Fix crash on exit with Blender Internal baking and envmap render.
Diffstat (limited to 'source/blender/render/intern/source/convertblender.c')
-rw-r--r--source/blender/render/intern/source/convertblender.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/source/blender/render/intern/source/convertblender.c b/source/blender/render/intern/source/convertblender.c
index 1e5e9025dcd..8aea86cf6d0 100644
--- a/source/blender/render/intern/source/convertblender.c
+++ b/source/blender/render/intern/source/convertblender.c
@@ -5871,11 +5871,7 @@ void RE_Database_Baking(Render *re, Main *bmain, Scene *scene, unsigned int lay,
re->lay= lay;
/* renderdata setup and exceptions */
- BLI_freelistN(&re->r.layers);
- BLI_freelistN(&re->r.views);
- re->r = scene->r;
- BLI_duplicatelist(&re->r.layers, &scene->r.layers);
- BLI_duplicatelist(&re->r.views, &scene->r.views);
+ render_copy_renderdata(&re->r, &scene->r);
RE_init_threadcount(re);