Merged changes in the trunk up to revision 46045.

[blender-staging.git] / source / blender / render / intern / source / render_result.c

diff --git a/source/blender/render/intern/source/render_result.c b/source/blender/render/intern/source/render_result.c
index 162fc1609150a000de56e83626d5899e49389dd7..0740597fce59404c9459a6e128173545a2b0669c 100644 (file)
--- a/source/blender/render/intern/source/render_result.c
+++ b/source/blender/render/intern/source/render_result.c
@@ -56,6 +56,8 @@
 #include "render_result.h"
 #include "render_types.h"
 
 #include "render_result.h"
 #include "render_types.h"
 

+#include "FRS_freestyle_config.h"
+

 /********************************** Free *************************************/
 
 void render_result_free(RenderResult *res)
 /********************************** Free *************************************/
 
 void render_result_free(RenderResult *res)


@@ -554,6 +556,7 @@ RenderResult *render_result_new(Render *re, rcti *partrct, int crop, int savebuf
                rl->lay= (1<<20) -1;
                rl->layflag= 0x7FFF;    /* solid ztra halo strand */
                rl->passflag= SCE_PASS_COMBINED;
                rl->lay= (1<<20) -1;
                rl->layflag= 0x7FFF;    /* solid ztra halo strand */
                rl->passflag= SCE_PASS_COMBINED;

+               FRS_add_freestyle_config( srl );

                
                re->r.actlay= 0;
        }
                
                re->r.actlay= 0;
        }