Merged changes in the trunk up to revision 55357.
[blender.git] / source / blender / render / intern / source / render_result.c
index ab0f16c8c2a90a81c4e0c9c37cc7c128905ce6ff..21e7b6986100826b7679b7c8a38ecfb725ee8124 100644 (file)
 #include "render_result.h"
 #include "render_types.h"
 
+#ifdef WITH_FREESTYLE
+#  include "FRS_freestyle_config.h"
+#endif
+
 /********************************** Free *************************************/
 
 void render_result_free(RenderResult *res)
@@ -564,6 +568,9 @@ 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;
+#ifdef WITH_FREESTYLE
+               FRS_init_freestyle_config(&srl->freestyleConfig);
+#endif
                
                re->r.actlay = 0;
        }