diff options
author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-11-26 22:33:31 +0400 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-11-26 22:33:31 +0400 |
commit | 6f1473fb7c6b3bfa30d750482bd1c7ac197f4a92 (patch) | |
tree | 49a1ffa97c8e4abf51a9d67fa0914b9c9279309f /source/blender/render/intern | |
parent | 616bf9bae307c6ede0b9e96ae935259238ef212f (diff) |
Fix #29406: show Sequence as render layer when rendering from sequencer, to make
it more clear what was rendered.
Fix #29407: external engine api doesn't support full sample yet, would give too
dark render result.
Diffstat (limited to 'source/blender/render/intern')
-rw-r--r-- | source/blender/render/intern/source/external_engine.c | 6 | ||||
-rw-r--r-- | source/blender/render/intern/source/pipeline.c | 5 |
2 files changed, 11 insertions, 0 deletions
diff --git a/source/blender/render/intern/source/external_engine.c b/source/blender/render/intern/source/external_engine.c index 38ace8d5121..2b44bad82ab 100644 --- a/source/blender/render/intern/source/external_engine.c +++ b/source/blender/render/intern/source/external_engine.c @@ -113,6 +113,12 @@ RenderEngineType *RE_engines_find(const char *idname) return type; } +int RE_engine_is_external(Render *re) +{ + RenderEngineType *type= RE_engines_find(re->r.engine); + return (type && type->render); +} + /* Create, Free */ RenderEngine *RE_engine_create(RenderEngineType *type) diff --git a/source/blender/render/intern/source/pipeline.c b/source/blender/render/intern/source/pipeline.c index c5cea980b04..52fb1eb48dc 100644 --- a/source/blender/render/intern/source/pipeline.c +++ b/source/blender/render/intern/source/pipeline.c @@ -2849,6 +2849,11 @@ static void validate_render_settings(Render *re) if(re->r.osa==0) re->r.scemode &= ~R_FULL_SAMPLE; } else re->r.scemode &= ~R_FULL_SAMPLE; /* clear to be sure */ + + if(RE_engine_is_external(re)) { + /* not supported yet */ + re->r.scemode &= ~(R_EXR_TILE_FILE|R_FULL_SAMPLE); + } } static void update_physics_cache(Render *re, Scene *scene, int UNUSED(anim_init)) |