diff options
| author | Janne Karhu <jhkarh@gmail.com> | 2010-11-01 16:51:11 +0300 |
|---|---|---|
| committer | Janne Karhu <jhkarh@gmail.com> | 2010-11-01 16:51:11 +0300 |
| commit | 3a8c37bb240f9226526b70165c04c911ed4d3c14 (patch) | |
| tree | 3d945142b0c888266a7504033822adc19f0f86c3 /source/blender | |
| parent | 726e6d85305a228f3e13f348cd8d209c6734d1e5 (diff) | |
"Fix" for [#22537] motion blur render result incorrect when full sample anti-aliasing is selected
* FSA and motion blur can't work nicely together the way they're currently implemented, so I disabled this in the ui and code.
* FSA is used if both are selected.
* Also changed the name "Full Sample Motion Blur" to "Sampled Motion Blur" to avoid confusion with full sample anti-aliasing.
Diffstat (limited to 'source/blender')
| -rw-r--r-- | source/blender/render/intern/source/pipeline.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/render/intern/source/pipeline.c b/source/blender/render/intern/source/pipeline.c index 6fac7e7b4aa..1b08f9adfab 100644 --- a/source/blender/render/intern/source/pipeline.c +++ b/source/blender/render/intern/source/pipeline.c @@ -1965,7 +1965,7 @@ static void do_render_fields_3d(Render *re) /* first field, we have to call camera routine for correct aspect and subpixel offset */ RE_SetCamera(re, re->scene->camera); - if(re->r.mode & R_MBLUR) + if(re->r.mode & R_MBLUR && (re->r.scemode & R_FULL_SAMPLE)==0) do_render_blur_3d(re); else do_render_3d(re); @@ -1985,7 +1985,7 @@ static void do_render_fields_3d(Render *re) re->field_offs = 0.5f; } RE_SetCamera(re, re->scene->camera); - if(re->r.mode & R_MBLUR) + if(re->r.mode & R_MBLUR && (re->r.scemode & R_FULL_SAMPLE)==0) do_render_blur_3d(re); else do_render_3d(re); @@ -2075,7 +2075,7 @@ static void do_render_fields_blur_3d(Render *re) if(re->r.mode & R_FIELDS) do_render_fields_3d(re); - else if(re->r.mode & R_MBLUR) + else if(re->r.mode & R_MBLUR && (re->r.scemode & R_FULL_SAMPLE)==0) do_render_blur_3d(re); else do_render_3d(re); |