diff options
author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2014-07-03 06:09:11 +0400 |
---|---|---|
committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2014-07-03 06:09:11 +0400 |
commit | 3f1ed437c103ce016e9a465084624fb36470a61d (patch) | |
tree | f53392acf069e4b8c92fa5ae10ca1360e14a4609 | |
parent | fedbb888255efa6f790f5bb323e4e91da6382f21 (diff) |
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.
-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 56310158210..92f64d96e6c 100644 --- a/source/blender/render/intern/source/pipeline.c +++ b/source/blender/render/intern/source/pipeline.c @@ -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; } } } |