diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2016-02-13 23:07:55 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2016-02-14 00:54:29 +0300 |
| commit | 4c04149bca7c5cb9d13944be96e9a8224740a007 (patch) | |
| tree | cc5487a205820179c997134203e4c540b8c40278 /source/blender/render | |
| parent | 701a4a4e09343cc57d53a8767e609cf8da2ec945 (diff) | |
Fix crash when cancelling cycles bake in some cases.
Diffstat (limited to 'source/blender/render')
| -rw-r--r-- | source/blender/render/intern/source/external_engine.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/render/intern/source/external_engine.c b/source/blender/render/intern/source/external_engine.c index 0286aee64e8..094c4de1f55 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); |