diff options
| author | Ton Roosendaal <ton@blender.org> | 2010-12-17 18:24:03 +0300 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2010-12-17 18:24:03 +0300 |
| commit | f53e8b78b40084a3e37b59e81798fe8c7b5267e3 (patch) | |
| tree | 5b76b143705073c960a5206cf16a372ad7308062 /source/blender/render | |
| parent | 04590d86e7d9ce5c4ea4ef073145a4e3c98bf2d6 (diff) | |
Bug fix:
When compositing without render (Enable composite, no renderlayer nodes)
the option Full Sample AA caused havoc. Added warning for this case
and gracefully stop render.
Diffstat (limited to 'source/blender/render')
| -rw-r--r-- | source/blender/render/intern/source/pipeline.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/source/blender/render/intern/source/pipeline.c b/source/blender/render/intern/source/pipeline.c index 8cf1ec887f3..e458bc54468 100644 --- a/source/blender/render/intern/source/pipeline.c +++ b/source/blender/render/intern/source/pipeline.c @@ -2726,11 +2726,17 @@ int RE_is_rendering_allowed(Scene *scene, void *erh, void (*error)(void *handle, if(node->type==CMP_NODE_COMPOSITE) break; - if(node==NULL) { error(erh, "No Render Output Node in Scene"); return 0; } + + if(scene->r.scemode & R_FULL_SAMPLE) { + if(composite_needs_render(scene)==0) { + error(erh, "Full Sample AA not supported without 3d rendering"); + return 0; + } + } } } |