diff options
| author | Ton Roosendaal <ton@blender.org> | 2008-03-06 22:26:44 +0300 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2008-03-06 22:26:44 +0300 |
| commit | e179b3d98e4d26636d5f6becafa3a2129cc04fea (patch) | |
| tree | d755e4513b6792788c6bb5347a4d359118d6bfc9 /source/blender/render | |
| parent | 0374a3efb1082a01575d8a861e200c4dbf2a20c9 (diff) | |
FSA fix:
If you composite using multiple scenes, the "use FSA" button had to be set
or disabled for each scene. Now you can just set/disable FSA for the scene
that does the compositing. You can only disable FSA in other scenes if it
was set before though.
(Any understands these lines? :)
Diffstat (limited to 'source/blender/render')
| -rw-r--r-- | source/blender/render/intern/source/pipeline.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/source/blender/render/intern/source/pipeline.c b/source/blender/render/intern/source/pipeline.c index 74c3faca9d5..a3368f0496d 100644 --- a/source/blender/render/intern/source/pipeline.c +++ b/source/blender/render/intern/source/pipeline.c @@ -1086,8 +1086,12 @@ void RE_InitState(Render *re, Render *source, RenderData *rd, int winx, int winy re->r.scemode &= ~R_FULL_SAMPLE; /* clear, so we can use this flag for test both */ /* fullsample wants uniform osa levels */ - if(source && re->r.scemode & R_FULL_SAMPLE) { - re->r.osa= re->osa= source->osa; + if(source && (re->r.scemode & R_FULL_SAMPLE)) { + /* but, if source has no full sample we disable it */ + if((source->r.scemode & R_FULL_SAMPLE)==0) + re->r.scemode &= ~R_FULL_SAMPLE; + else + re->r.osa= re->osa= source->osa; } else { /* check state variables, osa? */ |