Merged changes in the trunk up to revision 25863.
[blender.git] / source / blender / editors / screen / screen_ops.c
index 4125ced4e7165201a97e8c65e26f083f88e71e4b..a0df3a2360ebc42b48e76cc87dca3200c48c4998 100644 (file)
@@ -2810,6 +2810,9 @@ static int screen_render_exec(bContext *C, wmOperator *op)
        }
        RE_test_break_cb(re, NULL, (int (*)(void *)) blender_test_break);
        
+       /* inform Freestyle of the context */
+       FRS_set_context(C);
+
        if(RNA_boolean_get(op->ptr, "animation"))
                RE_BlenderAnim(re, scene, scene->r.sfra, scene->r.efra, scene->r.frame_step, op->reports);
        else
@@ -3092,6 +3095,9 @@ static int screen_render_invoke(bContext *C, wmOperator *op, wmEvent *event)
        /* handle UI stuff */
        WM_cursor_wait(1);
        
+       /* inform Freestyle of the context */
+       FRS_set_context(C);
+
        /* flush multires changes (for sculpt) */
        multires_force_update(CTX_data_active_object(C));