diff options
| author | Jeroen Bakker <j.bakker@atmind.nl> | 2014-07-01 21:43:52 +0400 |
|---|---|---|
| committer | Jeroen Bakker <j.bakker@atmind.nl> | 2014-07-01 21:43:52 +0400 |
| commit | cc1372546ad5d05047a80251739d2aab9485b8f1 (patch) | |
| tree | 7893f37b51d7c0a56979a7e5f15169f5ac8fe6a0 /source | |
| parent | ecc2e298e8799c568840ead430264304cfc47250 (diff) | |
Fix for segmentation fault in pipeline (freestyle/wm related)
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/render/intern/source/pipeline.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/source/blender/render/intern/source/pipeline.c b/source/blender/render/intern/source/pipeline.c index 676e28ca940..56310158210 100644 --- a/source/blender/render/intern/source/pipeline.c +++ b/source/blender/render/intern/source/pipeline.c @@ -2013,10 +2013,11 @@ static void free_all_freestyle_renders(void) /* 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; + if (re1->freestyle_bmain) { + re1->freestyle_bmain->wm.first = re1->freestyle_bmain->wm.last = NULL; - BKE_main_free(re1->freestyle_bmain); - re1->freestyle_bmain = NULL; + BKE_main_free(re1->freestyle_bmain); + } } } #endif |