Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix for Bug #35970: Freestyle + Particles = Crash.

Browse Source 
The crash was caused by a reference of freed memory in add_halo_flare() that relied
on the global variable R to retrieve a list of objects.  The value of this variable
is invalidated by a nested execution of the Blender Internal renderer for Freestyle
stroke rendering, leading to the documented memory reference issue.
This commit is contained in:
Tamito Kajiyama
2013-07-07 17:24:30 +00:00
parent 15a2287a8e
commit 22f26b2ce4
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
source/blender/render/intern/source/pipeline.c
View File

@@ -1676,6 +1676,9 @@ static void add_freestyle(Render *re, int render)
} }
FRS_finish_stroke_rendering(re); FRS_finish_stroke_rendering(re);
/* restore the global R value (invalidated by nested execution of the internal renderer) */
R = *re;
} }
/* merges the results of Freestyle stroke rendering into a given render result */ /* merges the results of Freestyle stroke rendering into a given render result */