[Bf-blender-cvs] [8087cefd030] soc-2018-hair-shader: Enable Filter Glossy for the hair shader

[L. E. Segovia]

Commit: 8087cefd03022759250f5d62eb4776fa6c55be4c
Author: L. E. Segovia
Date:   Tue May 29 13:40:49 2018 +0000
Branches: soc-2018-hair-shader
https://developer.blender.org/rB8087cefd03022759250f5d62eb4776fa6c55be4c

Enable Filter Glossy for the hair shader

Ref T54796

===================================================================

M	intern/cycles/kernel/closure/bsdf.h
M	intern/cycles/kernel/closure/bsdf_hair_principled.h

===================================================================

diff --git a/intern/cycles/kernel/closure/bsdf.h b/intern/cycles/kernel/closure/bsdf.h
index 7c17a695785..0c26c74370d 100644
--- a/intern/cycles/kernel/closure/bsdf.h
+++ b/intern/cycles/kernel/closure/bsdf.h
@@ -433,6 +433,9 @@ ccl_device void bsdf_blur(KernelGlobals *kg, ShaderClosure *sc, float roughness)
 		case CLOSURE_BSDF_ASHIKHMIN_SHIRLEY_ANISO_ID:
 			bsdf_ashikhmin_shirley_blur(sc, roughness);
 			break;
+		case CLOSURE_BSDF_HAIR_PRINCIPLED_ID:
+			bsdf_principled_hair_blur(sc, roughness);
+			break;
 		default:
 			break;
 	}
diff --git a/intern/cycles/kernel/closure/bsdf_hair_principled.h b/intern/cycles/kernel/closure/bsdf_hair_principled.h
index 3a7950ad191..e35cdf57abc 100644
--- a/intern/cycles/kernel/closure/bsdf_hair_principled.h
+++ b/intern/cycles/kernel/closure/bsdf_hair_principled.h
@@ -451,6 +451,14 @@ ccl_device int bsdf_principled_hair_sample(ShaderData *sd, const ShaderClosure *
 	return LABEL_GLOSSY|((p == 0)? LABEL_REFLECT : LABEL_TRANSMIT);
 }
 
+ccl_device void bsdf_principled_hair_blur(ShaderClosure *sc, float roughness)
+{
+	PrincipledHairBSDF *bsdf = (PrincipledHairBSDF*)sc;
+	
+	bsdf->v = fmaxf(roughness, bsdf->v);
+	bsdf->s = fmaxf(roughness, bsdf->s);
+}
+
 CCL_NAMESPACE_END
 
 #endif /* __BSDF_HAIR_PRINCIPLED_H__ */