diff options
author | Thomas Dinges <blender@dingto.org> | 2014-06-14 18:14:36 +0400 |
---|---|---|
committer | Thomas Dinges <blender@dingto.org> | 2014-06-14 18:14:54 +0400 |
commit | 5713d80804de8795a59fc04e95af3f50617adcfa (patch) | |
tree | 0fbdd2ab926ade446bd8195c87e843b69d9a6d00 | |
parent | 871a8eb6b265f8ccfb502107a0c60741b153fb42 (diff) |
Fix for last commit, forgot changes in Cycles itself.
-rw-r--r-- | intern/cycles/blender/blender_shader.cpp | 3 | ||||
-rw-r--r-- | intern/cycles/render/nodes.cpp | 1 |
2 files changed, 0 insertions, 4 deletions
diff --git a/intern/cycles/blender/blender_shader.cpp b/intern/cycles/blender/blender_shader.cpp index 318ca10b81a..51d8a4da744 100644 --- a/intern/cycles/blender/blender_shader.cpp +++ b/intern/cycles/blender/blender_shader.cpp @@ -323,9 +323,6 @@ static ShaderNode *add_node(Scene *scene, BL::BlendData b_data, BL::Scene b_scen switch (b_aniso_node.distribution()) { - case BL::ShaderNodeBsdfAnisotropic::distribution_SHARP: - aniso->distribution = ustring("Sharp"); - break; case BL::ShaderNodeBsdfAnisotropic::distribution_BECKMANN: aniso->distribution = ustring("Beckmann"); break; diff --git a/intern/cycles/render/nodes.cpp b/intern/cycles/render/nodes.cpp index c3aef362428..6401d6d8e36 100644 --- a/intern/cycles/render/nodes.cpp +++ b/intern/cycles/render/nodes.cpp @@ -1589,7 +1589,6 @@ static ShaderEnum aniso_distribution_init() { ShaderEnum enm; - enm.insert("Sharp", CLOSURE_BSDF_REFLECTION_ID); enm.insert("Beckmann", CLOSURE_BSDF_MICROFACET_BECKMANN_ANISO_ID); enm.insert("GGX", CLOSURE_BSDF_MICROFACET_GGX_ANISO_ID); enm.insert("Ashikhmin-Shirley", CLOSURE_BSDF_ASHIKHMIN_SHIRLEY_ANISO_ID); |