diff options
| author | Alfredo de Greef <eeshlo@yahoo.com> | 2005-05-28 06:50:55 +0400 |
|---|---|---|
| committer | Alfredo de Greef <eeshlo@yahoo.com> | 2005-05-28 06:50:55 +0400 |
| commit | 5b014b0c9cb1b5d59b8b2df3e043cfbaea8194fa (patch) | |
| tree | 022f3730abf9eb84ea913f92fe085382a0c345ac /source/blender/yafray | |
| parent | bdc928b2984ae8be169e991122934492c4d0bac5 (diff) | |
Some last minute tweaks, for world background image, 'Hori' must now be
enabled.
And when using Blender's AO parameters, the lowest sample number
when no cache is used is 4.
Diffstat (limited to 'source/blender/yafray')
| -rwxr-xr-x | source/blender/yafray/intern/export_File.cpp | 7 | ||||
| -rw-r--r-- | source/blender/yafray/intern/export_Plugin.cpp | 7 |
2 files changed, 8 insertions, 6 deletions
diff --git a/source/blender/yafray/intern/export_File.cpp b/source/blender/yafray/intern/export_File.cpp index 272c830d7b7..b0ac5bfa6a8 100755 --- a/source/blender/yafray/intern/export_File.cpp +++ b/source/blender/yafray/intern/export_File.cpp @@ -1784,7 +1784,8 @@ void yafrayFileRender_t::writeHemilight() else { ostr << "<light type=\"hemilight\" name=\"hemi_LT\" power=\"" << R.r.GIpower << "\""; if (fromAO) { - ostr << "\n\tsamples=\"" << world->aosamp*world->aosamp + // use minimum of 4 samples for lowest sample setting, single sample way too noisy + ostr << "\n\tsamples=\"" << 3 + world->aosamp*world->aosamp << "\" maxdistance=\"" << world->aodist << "\" use_QMC=\"" << ((world->aomode & WO_AORNDSMP) ? "off" : "on") << "\" >\n"; } @@ -1867,8 +1868,8 @@ bool yafrayFileRender_t::writeWorld() MTex* wtex = world->mtex[i]; if (!wtex) continue; Image* wimg = wtex->tex->ima; - // now always exports if image used as world texture - if ((wtex->tex->type==TEX_IMAGE) && (wimg!=NULL)) { + // now always exports if image used as world texture (and 'Hori' mapping enabled) + if ((wtex->tex->type==TEX_IMAGE) && (wimg!=NULL) && (wtex->mapto & WOMAP_HORIZ)) { string wt_path = wimg->name; adjustPath(wt_path); ostr.str(""); diff --git a/source/blender/yafray/intern/export_Plugin.cpp b/source/blender/yafray/intern/export_Plugin.cpp index 886198c7be3..83ea08afa61 100644 --- a/source/blender/yafray/intern/export_Plugin.cpp +++ b/source/blender/yafray/intern/export_Plugin.cpp @@ -1768,7 +1768,8 @@ void yafrayPluginRender_t::writeHemilight() params["name"] = yafray::parameter_t("hemi_LT"); params["power"] = yafray::parameter_t(R.r.GIpower); if (fromAO) { - params["samples"] = yafray::parameter_t(world->aosamp*world->aosamp); + // use minimum of 4 samples for lowest sample setting, single sample way too noisy + params["samples"] = yafray::parameter_t(3 + world->aosamp*world->aosamp); params["maxdistance"] = yafray::parameter_t(world->aodist); params["use_QMC"] = yafray::parameter_t((world->aomode & WO_AORNDSMP) ? "off" : "on"); } @@ -1860,8 +1861,8 @@ bool yafrayPluginRender_t::writeWorld() MTex* wtex = world->mtex[i]; if (!wtex) continue; Image* wimg = wtex->tex->ima; - // now always exports if image used as world texture - if ((wtex->tex->type==TEX_IMAGE) && (wimg!=NULL)) { + // now always exports if image used as world texture (and 'Hori' mapping enabled) + if ((wtex->tex->type==TEX_IMAGE) && (wimg!=NULL) && (wtex->mapto & WOMAP_HORIZ)) { string wt_path = wimg->name; adjustPath(wt_path); params["type"] = yafray::parameter_t("image"); |