diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-11-08 16:33:17 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-11-08 16:33:17 +0400 |
| commit | 64ab4140268498384525e05596ea1f559b7cd3df (patch) | |
| tree | c27a3774eb433e0cccd5d3284e6b79f96e32306d /intern | |
| parent | dca15b215d994c7bafe9398493a9db1b4df00246 (diff) | |
| parent | db75cc4cdebb536774a8f2d7601319e2c898ecb0 (diff) | |
Cycles: svn merge -r41627:41650 ^/trunk/blender
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/cycles/blender/blender_shader.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/intern/cycles/blender/blender_shader.cpp b/intern/cycles/blender/blender_shader.cpp index 2e558cf3e97..f1b032b5cc8 100644 --- a/intern/cycles/blender/blender_shader.cpp +++ b/intern/cycles/blender/blender_shader.cpp @@ -118,7 +118,7 @@ static ShaderNode *add_node(BL::BlendData b_data, ShaderGraph *graph, BL::Node * case BL::ShaderNode::type_COMBRGB: break; case BL::ShaderNode::type_CURVE_RGB: break; case BL::ShaderNode::type_CURVE_VEC: break; - case BL::ShaderNode::type_GEOM: break; + case BL::ShaderNode::type_GEOMETRY: break; case BL::ShaderNode::type_HUE_SAT: break; case BL::ShaderNode::type_INVERT: break; case BL::ShaderNode::type_MATERIAL: break; @@ -218,10 +218,6 @@ static ShaderNode *add_node(BL::BlendData b_data, ShaderGraph *graph, BL::Node * node = new HoldoutNode(); break; } - case BL::ShaderNode::type_BSDF_ANISOTROPIC: { - node = new WardBsdfNode(); - break; - } case BL::ShaderNode::type_BSDF_DIFFUSE: { node = new DiffuseBsdfNode(); break; @@ -285,7 +281,7 @@ static ShaderNode *add_node(BL::BlendData b_data, ShaderGraph *graph, BL::Node * node = new TransparentVolumeNode(); break; } - case BL::ShaderNode::type_GEOMETRY: { + case BL::ShaderNode::type_NEW_GEOMETRY: { node = new GeometryNode(); break; } |