[Bf-blender-cvs] [16e1bbf] master: Fix T47076: Memory issues when closing Blendera after Cycles baking

[Sergey Sharybin]

Commit: 16e1bbf1dbbefde14533b0de5b68ae3ac269e05c
Author: Sergey Sharybin
Date:   Thu Dec 31 14:49:58 2015 +0500
Branches: master
https://developer.blender.org/rB16e1bbf1dbbefde14533b0de5b68ae3ac269e05c

Fix T47076: Memory issues when closing Blendera after Cycles baking

===================================================================

M       source/blender/render/intern/source/external_engine.c

===================================================================

diff --git a/source/blender/render/intern/source/external_engine.c 
b/source/blender/render/intern/source/external_engine.c
index 8adac7c..268865f 100644
--- a/source/blender/render/intern/source/external_engine.c
+++ b/source/blender/render/intern/source/external_engine.c
@@ -44,6 +44,7 @@
 
 #include "BKE_camera.h"
 #include "BKE_global.h"
+#include "BKE_colortools.h"
 #include "BKE_report.h"
 #include "BKE_scene.h"
 
@@ -457,6 +458,7 @@ void RE_bake_engine_set_engine_parameters(Render *re, Main 
*bmain, Scene *scene)
         * not sure how to fix this yet -- dfelinto */
        BLI_listbase_clear(&re->r.layers);
        BLI_listbase_clear(&re->r.views);
+       curvemapping_copy_data(&re->r.mblur_shutter_curve, 
&scene->r.mblur_shutter_curve);
 }
 
 bool RE_bake_has_engine(Render *re)

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs