Merged changes in the trunk up to revision 26719.
[blender-staging.git] / source / blender / editors / screen / screen_ops.c
index 53cd34c46f5b0534ed830a61ed54a93f84f4a5c9..d747fc26aed176f36f869e0016207ea6bf8cf333 100644 (file)
@@ -2892,6 +2892,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
@@ -3178,6 +3181,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_render_update(CTX_data_active_object(C));