diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-01-26 23:20:33 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-01-26 23:20:33 +0400 |
| commit | de4eeb96946943289ac898525f09fc9c7afd4157 (patch) | |
| tree | 5887eac0f56db6ce226a25ae34eaaa1169c7ee3a /source/blender/render | |
| parent | ce90b472afbe4f90af60e19a0a6cc6704d3a3549 (diff) | |
| parent | 4514a4455be89bc0a789d78355321abe6cfd5112 (diff) | |
svn merge ^/trunk/blender -r43693:43733
Diffstat (limited to 'source/blender/render')
| -rw-r--r-- | source/blender/render/intern/source/pipeline.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/source/blender/render/intern/source/pipeline.c b/source/blender/render/intern/source/pipeline.c index f585912c18c..604ba189dcf 100644 --- a/source/blender/render/intern/source/pipeline.c +++ b/source/blender/render/intern/source/pipeline.c @@ -1894,6 +1894,7 @@ static void validate_render_settings(Render *re) if(RE_engine_is_external(re)) { /* not supported yet */ re->r.scemode &= ~(R_EXR_TILE_FILE|R_FULL_SAMPLE); + re->r.mode &= ~R_FIELDS; } } |