diff options
| author | Johnny Matthews <johnny.matthews@gmail.com> | 2004-04-15 19:52:28 +0400 |
|---|---|---|
| committer | Johnny Matthews <johnny.matthews@gmail.com> | 2004-04-15 19:52:28 +0400 |
| commit | 328f6c7c9ea56df3edf2067a9f9d410b98914d90 (patch) | |
| tree | 00c449e3bf6986433997c6c5832949522b2e63e1 /source/blender/yafray | |
| parent | d753f8a681bbddbef229a0cf80c288205ca122f4 (diff) | |
Added "Auto AA" toggle in Yafray Render panel defaulted to On (current functionality AA is determined by OSA and GI quality settings)
When disbaled, 2 number buttons appear to allow setting manual AA passes and AA samples.
Johnny Matthews (guitarGeek)
Diffstat (limited to 'source/blender/yafray')
| -rwxr-xr-x | source/blender/yafray/intern/export_File.cpp | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/source/blender/yafray/intern/export_File.cpp b/source/blender/yafray/intern/export_File.cpp index ae2313fac03..fa4f6a69c71 100755 --- a/source/blender/yafray/intern/export_File.cpp +++ b/source/blender/yafray/intern/export_File.cpp @@ -205,15 +205,19 @@ bool yafrayFileRender_t::writeRender() ostr << "\traydepth=\"" << R.r.YF_raydepth << "\" gamma=\"" << R.r.YF_gamma << "\" exposure=\"" << R.r.YF_exposure << "\"\n"; //if( (G.scene->world!=NULL) && (G.scene->world->GIquality>1) && ! G.scene->world->cache ) - if ((R.r.GImethod!=0) && (R.r.GIquality>1) && (!R.r.GIcache)) - ostr << "\tAA_passes=\"5\" AA_minsamples=\"5\" " << endl; - else if ((R.r.mode & R_OSA) && (R.r.osa)) { - int passes=(R.r.osa%4)==0 ? R.r.osa/4 : 1; - int minsamples=(R.r.osa%4)==0 ? 4 : R.r.osa; - ostr << "\tAA_passes=\"" << passes << "\" AA_minsamples=\"" << minsamples << "\""; + if(R.r.YF_AA){ + ostr << "\tAA_passes=\"" << R.r.YF_AApasses << "\" AA_minsamples=\"" << R.r.YF_AAsamples << "\""; + } + else{ + if ((R.r.GImethod!=0) && (R.r.GIquality>1) && (!R.r.GIcache)) + ostr << "\tAA_passes=\"5\" AA_minsamples=\"5\" " << endl; + else if ((R.r.mode & R_OSA) && (R.r.osa)) { + int passes=(R.r.osa%4)==0 ? R.r.osa/4 : 1; + int minsamples=(R.r.osa%4)==0 ? 4 : R.r.osa; + ostr << "\tAA_passes=\"" << passes << "\" AA_minsamples=\"" << minsamples << "\""; + } + else ostr << "\tAA_passes=\"0\" AA_minsamples=\"1\""; } - else ostr << "\tAA_passes=\"0\" AA_minsamples=\"1\""; - ostr << "\n"; if (hasworld) ostr << "\tbackground_name=\"world_background\"\n"; |