blender
/
blender
134
399
Fork 582
Code Issues 6.3k Pull Requests 757 Projects 19 Wiki Activity

Fix crash when cancelling cycles bake in some cases.

This commit is contained in:
Brecht Van Lommel 2016-02-13 21:07:55 +01:00
parent 701a4a4e09
commit 4c04149bca
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/render/intern/source/external_engine.c
View File

@ -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);