diff options
| author | Janne Karhu <jhkarh@gmail.com> | 2010-11-07 00:32:58 +0300 |
|---|---|---|
| committer | Janne Karhu <jhkarh@gmail.com> | 2010-11-07 00:32:58 +0300 |
| commit | 9e7c96811366f5ab0b357492211db1debabf1e0b (patch) | |
| tree | 805da2f2dc463a22fc9e8279c56f35c710ff8704 /source/blender/render | |
| parent | d475448bddaff1419d1b1f1aca082fa8f8f9a98c (diff) | |
Bug fix: Rendering with anti-aliasing disabled and full samples enabled crashed
* Disabling anti-aliasing disables full samples in ui, so do that in render code too.
Diffstat (limited to 'source/blender/render')
| -rw-r--r-- | source/blender/render/intern/source/pipeline.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/source/blender/render/intern/source/pipeline.c b/source/blender/render/intern/source/pipeline.c index c90d581ca01..50fd5aba87b 100644 --- a/source/blender/render/intern/source/pipeline.c +++ b/source/blender/render/intern/source/pipeline.c @@ -1247,6 +1247,9 @@ void RE_InitState(Render *re, Render *source, RenderData *rd, SceneRenderLayer * return; } + if((re->r.mode & (R_OSA))==0) + re->r.scemode &= ~R_FULL_SAMPLE; + #ifdef WITH_OPENEXR if(re->r.scemode & R_FULL_SAMPLE) re->r.scemode |= R_EXR_TILE_FILE; /* enable automatic */ |