Commit: efb48fcbbb226e9a2d686a1d952cdedad7cdf941
Author: Sergey Sharybin
Date: Thu Mar 20 13:15:27 2014 +0600
https://developer.blender.org/rBefb48fcbbb226e9a2d686a1d952cdedad7cdf941
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.
===================================================================
M source/blender/render/intern/source/convertblender.c
===================================================================
diff --git a/source/blender/render/intern/source/convertblender.c
b/source/blender/render/intern/source/convertblender.c
index 8fc8274..1d7575b 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);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
