[Bf-blender-cvs] [4c04149] master: Fix crash when cancelling cycles bake in some cases.

[Brecht Van Lommel]

Commit: 4c04149bca7c5cb9d13944be96e9a8224740a007
Author: Brecht Van Lommel
Date:   Sat Feb 13 21:07:55 2016 +0100
Branches: master
https://developer.blender.org/rB4c04149bca7c5cb9d13944be96e9a8224740a007

Fix crash when cancelling cycles bake in some cases.

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

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 0286aee..094c4de 100644
--- a/source/blender/render/intern/source/external_engine.c
+++ b/source/blender/render/intern/source/external_engine.c
@@ -452,6 +452,8 @@ RenderData *RE_engine_get_render_data(Render *re)
 /* Bake */
 void RE_bake_engine_set_engine_parameters(Render *re, Main *bmain, Scene *scene)
 {
+	curvemapping_free_data(&re->r.mblur_shutter_curve);
+
 	re->scene = scene;
 	re->main = bmain;
 	re->r = scene->r;
@@ -519,8 +521,6 @@ bool RE_bake_engine(
 
 	BLI_rw_mutex_lock(&re->partsmutex, THREAD_LOCK_WRITE);
 
-	curvemapping_free_data(&re->r.mblur_shutter_curve);
-
 	/* re->engine becomes zero if user changed active render engine during render */
 	if (!persistent_data || !re->engine) {
 		RE_engine_free(engine);