Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLukas Stockner <lukas.stockner@freenet.de>2016-07-10 17:41:21 +0300
committerLukas Stockner <lukas.stockner@freenet.de>2016-07-10 17:41:21 +0300
commitbb8bfdd4b600e0f82920901fdb0aa42dd65b059c (patch)
treef2e4433124979eed082e616058c3f5452c98c8e8
parente0c163661d339d35a518275993059136ee1e4e3e (diff)
Cycles: Fix failed assert with isotropic Ashikhmin-Shirley distribution in the Glossy node
The shader sync code used the anisotropic version of the Ashikhmin-Shirley closure for both Anisotropic and Glossy BSDF, which caused a failed assert because the anisotropic closure expects an addiitonal SVM node.
-rw-r--r--intern/cycles/blender/blender_shader.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/blender/blender_shader.cpp b/intern/cycles/blender/blender_shader.cpp
index 7ca23f23cb4..64559804ccb 100644
--- a/intern/cycles/blender/blender_shader.cpp
+++ b/intern/cycles/blender/blender_shader.cpp
@@ -440,7 +440,7 @@ static ShaderNode *add_node(Scene *scene,
glossy->distribution = CLOSURE_BSDF_MICROFACET_GGX_ID;
break;
case BL::ShaderNodeBsdfGlossy::distribution_ASHIKHMIN_SHIRLEY:
- glossy->distribution = CLOSURE_BSDF_ASHIKHMIN_SHIRLEY_ANISO_ID;
+ glossy->distribution = CLOSURE_BSDF_ASHIKHMIN_SHIRLEY_ID;
break;
case BL::ShaderNodeBsdfGlossy::distribution_MULTI_GGX:
glossy->distribution = CLOSURE_BSDF_MICROFACET_MULTI_GGX_ID;