Merged changes in the trunk up to revision 48893.
[blender-staging.git] / source / blender / render / intern / source / render_result.c
index 5da661e718263cc4d6b9caba6a1977fe04c754f8..9eb3f78635f306d0a3823b96d2620605bb4f2b09 100644 (file)
@@ -55,6 +55,8 @@
 #include "render_result.h"
 #include "render_types.h"
 
+#include "FRS_freestyle_config.h"
+
 /********************************** Free *************************************/
 
 void render_result_free(RenderResult *res)
@@ -553,6 +555,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;
+               FRS_add_freestyle_config( srl );
                
                re->r.actlay = 0;
        }