Commit: 5713d80804de8795a59fc04e95af3f50617adcfa
Author: Thomas Dinges
Date: Sat Jun 14 16:14:36 2014 +0200
https://developer.blender.org/rB5713d80804de8795a59fc04e95af3f50617adcfa
Fix for last commit, forgot changes in Cycles itself.
===================================================================
M intern/cycles/blender/blender_shader.cpp
M intern/cycles/render/nodes.cpp
===================================================================
diff --git a/intern/cycles/blender/blender_shader.cpp
b/intern/cycles/blender/blender_shader.cpp
index 318ca10..51d8a4d 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 c3aef36..6401d6d 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);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
