Since there still seem to be some commits being done, I thought I might

sqeeze in a minor bugfix.
I wouln't be surprised it is too late,
but since it really is sort of minor, it doesn't matter really.
I had mistakenly put the export of dispersion and absorption parameters in the
ray_mirror block instead of ray_transp, which means that both dispersion and
absorption can only be used if both ray mirror and ray transp are enabled.
Anyway, I don't want to make everyone recompile release builds if already
done, it is minor, but users should take this into account at least.

2 files changed, 30 insertions, 26 deletions

diff --git a/source/blender/yafray/intern/export_File.cpp b/source/blender/yafray/intern/export_File.cpp
index b0ac5bfa6a8..d35903ba91d 100755
--- a/source/blender/yafray/intern/export_File.cpp
+++ b/source/blender/yafray/intern/export_File.cpp
@@ -692,19 +692,6 @@ void yafrayFileRender_t::writeShader(const string &shader_name, Material* matr,
 		ostr << "\t\t<reflect_amount value=\""<< matr->ray_mirror << "\" />\n";
 		float fo = 1.f-(matr->fresnel_mir_i-1.f)*0.25f;	// blender param range [1,5], also here reversed (1 in Blender -> no fresnel)
 		ostr << "\t\t<fresnel_offset value=\""<< fo << "\" />\n";
-		// transmit absorption color
-		// to make things easier(?) for user it now specifies the actual color at 1 unit / YF_dscale of distance
-		const float maxlog = -log(1e-38);
-		float ar = (matr->YF_ar>0) ? -log(matr->YF_ar) : maxlog;
-		float ag = (matr->YF_ag>0) ? -log(matr->YF_ag) : maxlog;
-		float ab = (matr->YF_ab>0) ? -log(matr->YF_ab) : maxlog;
-		float sc = matr->YF_dscale;
-		if (sc!=0.f) sc=1.f/sc;
-		ostr << "\t\t<absorption r=\"" << ar*sc << "\" g=\"" << ag*sc << "\" b=\"" << ab*sc << "\" />\n";
-		// dispersion
-		ostr << "\t\t<dispersion_power value=\"" << matr->YF_dpwr << "\" />\n";
-		ostr << "\t\t<dispersion_samples value=\"" << matr->YF_dsmp << "\" />\n";
-		ostr << "\t\t<dispersion_jitter value=\"" << (matr->YF_djit ? "on" : "off") << "\" />\n";
 
 		// for backward compatibility, also add old 'reflected' parameter, copy of mirror_color
 		ostr << "\t\t<reflected r=\"" << matr->mirr << "\" g=\"" << matr->mirg << "\" b=\"" << matr->mirb << "\" />\n";
@@ -720,6 +707,21 @@ void yafrayFileRender_t::writeShader(const string &shader_name, Material* matr,
 		ostr << "\t\t<transmit_filter value=\"" << matr->filter << "\" />\n";
 		// tir on by default
 		ostr << "\t\t<tir value=\"on\" />\n";
+
+		// transmit absorption color
+		// to make things easier(?) for user it now specifies the actual color at 1 unit / YF_dscale of distance
+		const float maxlog = -log(1e-38);
+		float ar = (matr->YF_ar>0) ? -log(matr->YF_ar) : maxlog;
+		float ag = (matr->YF_ag>0) ? -log(matr->YF_ag) : maxlog;
+		float ab = (matr->YF_ab>0) ? -log(matr->YF_ab) : maxlog;
+		float sc = matr->YF_dscale;
+		if (sc!=0.f) sc=1.f/sc;
+		ostr << "\t\t<absorption r=\"" << ar*sc << "\" g=\"" << ag*sc << "\" b=\"" << ab*sc << "\" />\n";
+		// dispersion
+		ostr << "\t\t<dispersion_power value=\"" << matr->YF_dpwr << "\" />\n";
+		ostr << "\t\t<dispersion_samples value=\"" << matr->YF_dsmp << "\" />\n";
+		ostr << "\t\t<dispersion_jitter value=\"" << (matr->YF_djit ? "on" : "off") << "\" />\n";
+
 		// for backward compatibility, also add old 'transmitted' parameter, copy of 'color' * (1-alpha)
 		float na = 1.f-matr->alpha;
 		ostr << "\t\t<transmitted r=\"" << matr->r*na << "\" g=\"" << matr->g*na << "\" b=\"" << matr->b*na << "\" />\n";
diff --git a/source/blender/yafray/intern/export_Plugin.cpp b/source/blender/yafray/intern/export_Plugin.cpp
index 83ea08afa61..0dad8f9de36 100644
--- a/source/blender/yafray/intern/export_Plugin.cpp
+++ b/source/blender/yafray/intern/export_Plugin.cpp
@@ -679,19 +679,6 @@ void yafrayPluginRender_t::writeShader(const string &shader_name, Material* matr
 		params["reflect_amount"] = yafray::parameter_t(matr->ray_mirror);
 		float fo = 1.f-(matr->fresnel_mir_i-1.f)*0.25f;	// blender param range [1,5], also here reversed (1 in Blender -> no fresnel)
 		params["fresnel_offset"] = yafray::parameter_t(fo);
-		// transmit absorption color
-		// to make things easier(?) for user it now specifies the actual color at 1 unit / YF_dscale of distance
-		const float maxlog = -log(1e-38);
-		float ar = (matr->YF_ar>0) ? -log(matr->YF_ar) : maxlog;
-		float ag = (matr->YF_ag>0) ? -log(matr->YF_ag) : maxlog;
-		float ab = (matr->YF_ab>0) ? -log(matr->YF_ab) : maxlog;
-		float sc = matr->YF_dscale;
-		if (sc!=0.f) sc=1.f/sc;
-		params["absorption"] = yafray::parameter_t(yafray::color_t(ar*sc, ag*sc, ab*sc));
-		// dispersion
-		params["dispersion_power"] = yafray::parameter_t(matr->YF_dpwr);
-		params["dispersion_samples"] = yafray::parameter_t(matr->YF_dsmp);
-		params["dispersion_jitter"] = yafray::parameter_t(matr->YF_djit ? "on" : "off");
 
 		// for backward compatibility, also add old 'reflected' parameter, copy of mirror_color
 		params["reflected"] = yafray::parameter_t(yafray::color_t(matr->mirr, matr->mirg, matr->mirb));
@@ -707,6 +694,21 @@ void yafrayPluginRender_t::writeShader(const string &shader_name, Material* matr
 		params["transmit_filter"] = yafray::parameter_t(matr->filter);
 		// tir on by default
 		params["tir"] = yafray::parameter_t("on");
+
+		// transmit absorption color
+		// to make things easier(?) for user it now specifies the actual color at 1 unit / YF_dscale of distance
+		const float maxlog = -log(1e-38);
+		float ar = (matr->YF_ar>0) ? -log(matr->YF_ar) : maxlog;
+		float ag = (matr->YF_ag>0) ? -log(matr->YF_ag) : maxlog;
+		float ab = (matr->YF_ab>0) ? -log(matr->YF_ab) : maxlog;
+		float sc = matr->YF_dscale;
+		if (sc!=0.f) sc=1.f/sc;
+		params["absorption"] = yafray::parameter_t(yafray::color_t(ar*sc, ag*sc, ab*sc));
+		// dispersion
+		params["dispersion_power"] = yafray::parameter_t(matr->YF_dpwr);
+		params["dispersion_samples"] = yafray::parameter_t(matr->YF_dsmp);
+		params["dispersion_jitter"] = yafray::parameter_t(matr->YF_djit ? "on" : "off");
+
 		// for backward compatibility, also add old 'transmitted' parameter, copy of 'color' * (1-alpha)
 		float na = 1.f-matr->alpha;
 		params["transmitted"] = yafray::parameter_t(yafray::color_t(matr->r*na, matr->g*na, matr->b*na));