[Bf-blender-cvs] [3f1ed43] master: Follow-up to rBcc1372546ad5: Fix for segmentation fault in pipeline (freestyle/wm related).

[Tamito Kajiyama]

Commit: 3f1ed437c103ce016e9a465084624fb36470a61d
Author: Tamito Kajiyama
Date:   Thu Jul 3 11:09:11 2014 +0900
https://developer.blender.org/rB3f1ed437c103ce016e9a465084624fb36470a61d

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.

===================================================================

M	source/blender/render/intern/source/pipeline.c

===================================================================

diff --git a/source/blender/render/intern/source/pipeline.c b/source/blender/render/intern/source/pipeline.c
index 5631015..92f64d9 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;
 		}
 	}
 }