blender
/
blender
128
396
Fork 568
Code Issues 6.2k Pull Requests 750 Projects 19 Wiki Activity

Follow-up to rBcc1372546ad5: Fix for segmentation fault in pipeline (freestyle/wm related). 

Render->freestyle_bmain is set to NULL after BKE_main_free() so that
the struct Main is not considered for tagging any longer.
This commit is contained in:
Tamito Kajiyama 2014-07-03 11:09:11 +09:00
parent fedbb88825
commit 3f1ed437c1
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
source/blender/render/intern/source/pipeline.c
View File

@ -2010,13 +2010,14 @@ static void free_all_freestyle_renders(void)
}
BLI_freelistN(&re1->freestyle_renders);
/* detach the window manager from freestyle bmain (see comments in
* add_freestyle() for more detail)
*/
if (re1->freestyle_bmain) {
/* detach the window manager from freestyle bmain (see comments
* in add_freestyle() for more detail)
*/
re1->freestyle_bmain->wm.first = re1->freestyle_bmain->wm.last = NULL;
BKE_main_free(re1->freestyle_bmain);
re1->freestyle_bmain = NULL;
}
}
}