[Bf-blender-cvs] [698a9a2] master: Fix T41180: Crash when using motion blur with Freestyle.

[Tamito Kajiyama]

Commit: 698a9a2434ac3a4f87130b4013d5228e24f3a45d
Author: Tamito Kajiyama
Date:   Sun Jul 27 03:05:17 2014 +0900
Branches: master
https://developer.blender.org/rB698a9a2434ac3a4f87130b4013d5228e24f3a45d

Fix T41180: Crash when using motion blur with Freestyle.

In pipeline.c, do_render_3d() is called multiple times for each frame when
motion blur is used.  This caused duplicates of the same struct Render instance
in re->freestyle_renders, resulting in fatal double freeing of allocated memory.

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

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 2131b82..9e14645 100644
--- a/source/blender/render/intern/source/pipeline.c
+++ b/source/blender/render/intern/source/pipeline.c
@@ -1935,6 +1935,8 @@ static void add_freestyle(Render *re, int render)
 {
        SceneRenderLayer *srl, *actsrl;
        LinkData *link;
+       Render *r;
+       const bool do_link = (re->r.mode & R_MBLUR) == 0 || re->i.curblur == 
re->r.mblur_samples;
 
        actsrl = BLI_findlink(&re->r.layers, re->r.actlay);
 
@@ -1951,15 +1953,17 @@ static void add_freestyle(Render *re, int render)
 
        FRS_init_stroke_rendering(re);
 
-       for (srl= (SceneRenderLayer *)re->r.layers.first; srl; srl= srl->next) {
-
-               link = (LinkData *)MEM_callocN(sizeof(LinkData), "LinkData to 
Freestyle render");
-               BLI_addtail(&re->freestyle_renders, link);
-
+       for (srl = (SceneRenderLayer *)re->r.layers.first; srl; srl = 
srl->next) {
+               if (do_link) {
+                       link = (LinkData *)MEM_callocN(sizeof(LinkData), 
"LinkData to Freestyle render");
+                       BLI_addtail(&re->freestyle_renders, link);
+               }
                if ((re->r.scemode & R_SINGLE_LAYER) && srl != actsrl)
                        continue;
                if (FRS_is_freestyle_enabled(srl)) {
-                       link->data = (void *)FRS_do_stroke_rendering(re, srl, 
render);
+                       r = FRS_do_stroke_rendering(re, srl, render);
+                       if (do_link)
+                               link->data = (void *)r;
                }
        }

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs