tmaq
/
tornavis
1
0
Fork 0
Code Issues 2 Pull Requests 29 Packages Projects 24 Releases Wiki Activity

Cycles / Cleanup: 

* All references to old textures should now be finally removed.
This commit is contained in:
Thomas Dinges 2012-06-08 20:17:02 +00:00
parent 8a4f16739a
commit 49a64a0ab7
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
intern/cycles/app/cycles_xml.cpp
View File

@ -392,9 +392,9 @@ static void xml_read_shader_graph(const XMLReadState& state, Shader *shader, pug
snode = dist;
}
else if(string_iequals(node.name(), "wave_texture")) {
WaveTextureNode *wood = new WaveTextureNode();
xml_read_enum(&wood->type, WaveTextureNode::type_enum, node, "type");
snode = wood;
WaveTextureNode *wave = new WaveTextureNode();
xml_read_enum(&wave->type, WaveTextureNode::type_enum, node, "type");
snode = wave;
}
else if(string_iequals(node.name(), "normal")) {
snode = new NormalNode();

2
intern/cycles/render/nodes.cpp
View File

@ -695,7 +695,7 @@ static ShaderEnum wave_type_init()
ShaderEnum WaveTextureNode::type_enum = wave_type_init();
WaveTextureNode::WaveTextureNode()
: TextureNode("marble_texture")
: TextureNode("wave_texture")
{
type = ustring("Bands");