From efb48fcbbb226e9a2d686a1d952cdedad7cdf941 Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Thu, 20 Mar 2014 13:15:27 +0600 Subject: Fix for crash happening on blender exit after the bake The issue is caused by 1a79abdad, and annoyingly it's a regression since 2.69, so if we do 'a', this commit should be ported there. --- source/blender/render/intern/source/convertblender.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'source/blender/render') diff --git a/source/blender/render/intern/source/convertblender.c b/source/blender/render/intern/source/convertblender.c index 8fc8274dad1..1d7575bf918 100644 --- a/source/blender/render/intern/source/convertblender.c +++ b/source/blender/render/intern/source/convertblender.c @@ -5868,7 +5868,9 @@ void RE_Database_Baking(Render *re, Main *bmain, Scene *scene, unsigned int lay, re->lay= lay; /* renderdata setup and exceptions */ - re->r= scene->r; + BLI_freelistN(&re->r.layers); + re->r = scene->r; + BLI_duplicatelist(&re->r.layers, &scene->r.layers); RE_init_threadcount(re); -- cgit v1.2.3