Revision: 16358
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16358
Author: blendix
Date: 2008-09-04 02:27:05 +0200 (Thu, 04 Sep 2008)
Log Message:
-----------
Bugfix: yafray export crash if new hsv texture blend types were
used, the code here needed to be updated.
Modified Paths:
--------------
trunk/blender/source/blender/makesdna/DNA_texture_types.h
trunk/blender/source/blender/yafray/intern/export_File.cpp
trunk/blender/source/blender/yafray/intern/export_Plugin.cpp
Modified: trunk/blender/source/blender/makesdna/DNA_texture_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_texture_types.h 2008-09-04
00:16:34 UTC (rev 16357)
+++ trunk/blender/source/blender/makesdna/DNA_texture_types.h 2008-09-04
00:27:05 UTC (rev 16358)
@@ -367,6 +367,7 @@
#define MTEX_BLEND_SAT 11
#define MTEX_BLEND_VAL 12
#define MTEX_BLEND_COLOR 13
+#define MTEX_NUM_BLENDTYPES 14
/* **************** EnvMap ********************* */
Modified: trunk/blender/source/blender/yafray/intern/export_File.cpp
===================================================================
--- trunk/blender/source/blender/yafray/intern/export_File.cpp 2008-09-04
00:16:34 UTC (rev 16357)
+++ trunk/blender/source/blender/yafray/intern/export_File.cpp 2008-09-04
00:27:05 UTC (rev 16358)
@@ -881,7 +881,7 @@
ostr << "\t\t<input value=\"" << shader_name <<
"_map" << m2 << "\" />\n";
// blendtype, would have been nice if the order would
have been the same as for ramps...
- const string blendtype[9] = {"mix", "mul", "add",
"sub", "divide", "darken", "difference", "lighten", "screen"};
+ const string blendtype[MTEX_NUM_BLENDTYPES] = {"mix",
"mul", "add", "sub", "divide", "darken", "difference", "lighten", "screen",
"hue", "sat", "val", "color"};
ostr << "\t\t<mode value=\"" <<
blendtype[(int)mtex->blendtype] << "\" />\n";
// texture color (for use with MUL and/or no_rgb etc..)
Modified: trunk/blender/source/blender/yafray/intern/export_Plugin.cpp
===================================================================
--- trunk/blender/source/blender/yafray/intern/export_Plugin.cpp
2008-09-04 00:16:34 UTC (rev 16357)
+++ trunk/blender/source/blender/yafray/intern/export_Plugin.cpp
2008-09-04 00:27:05 UTC (rev 16358)
@@ -782,7 +782,7 @@
mparams["input"] =
yafray::parameter_t(shader_name + temp);
// blendtype, would have been nice if the order would
have been the same as for ramps...
- const string blendtype[9] = {"mix", "mul", "add",
"sub", "divide", "darken", "difference", "lighten", "screen"};
+ const string blendtype[MTEX_NUM_BLENDTYPES] = {"mix",
"mul", "add", "sub", "divide", "darken", "difference", "lighten", "screen",
"hue", "sat", "val", "color"};
mparams["mode"] =
yafray::parameter_t(blendtype[(int)mtex->blendtype]);
// texture color (for use with MUL and/or no_rgb etc..)
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
