diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-03-20 11:15:27 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-03-20 11:16:33 +0400 |
| commit | efb48fcbbb226e9a2d686a1d952cdedad7cdf941 (patch) | |
| tree | c2b7c57f1e570076341a551d73f3df83568a72cc /source/blender/render | |
| parent | e02b9c8a45266993e5cefb71d55234128aca208c (diff) | |
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.
Diffstat (limited to 'source/blender/render')
| -rw-r--r-- | source/blender/render/intern/source/convertblender.c | 4 |
1 files changed, 3 insertions, 1 deletions
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); |