Commit: cc1372546ad5d05047a80251739d2aab9485b8f1
Author: Jeroen Bakker
Date: Tue Jul 1 19:43:52 2014 +0200
https://developer.blender.org/rBcc1372546ad5d05047a80251739d2aab9485b8f1
Fix for segmentation fault in pipeline (freestyle/wm related)
===================================================================
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 676e28c..5631015 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
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
