From 5713d80804de8795a59fc04e95af3f50617adcfa Mon Sep 17 00:00:00 2001 From: Thomas Dinges Date: Sat, 14 Jun 2014 16:14:36 +0200 Subject: [PATCH] Fix for last commit, forgot changes in Cycles itself. --- intern/cycles/blender/blender_shader.cpp | 3 --- intern/cycles/render/nodes.cpp | 1 - 2 files changed, 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);