[Bf-blender-cvs] [9e5c1787a51] microfacet_hair: Remove empirical scaling to match microfacet and principled hair BSDF

Weizhen Huang noreply at git.blender.org
Mon Jan 16 16:20:24 CET 2023


Commit: 9e5c1787a51cdccbb8b0443fde1b1247c77c639b
Author: Weizhen Huang
Date:   Mon Jan 16 16:20:00 2023 +0100
Branches: microfacet_hair
https://developer.blender.org/rB9e5c1787a51cdccbb8b0443fde1b1247c77c639b

Remove empirical scaling to match microfacet and principled hair BSDF

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

M	intern/cycles/kernel/svm/closure.h

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

diff --git a/intern/cycles/kernel/svm/closure.h b/intern/cycles/kernel/svm/closure.h
index f4953e8beee..42abbbdd3a3 100644
--- a/intern/cycles/kernel/svm/closure.h
+++ b/intern/cycles/kernel/svm/closure.h
@@ -940,14 +940,6 @@ ccl_device_noinline int svm_node_closure_bsdf(KernelGlobals kg,
         bsdf->distribution_type = clamp(
             distribution_type, NODE_MICROFACET_HAIR_GGX, NODE_MICROFACET_HAIR_BECKMANN);
 
-        /* Empirical equivalences compared with principled hair BSDF. */
-        if (bsdf->distribution_type == NODE_MICROFACET_HAIR_GGX) {
-          roughness *= 0.5f;
-        }
-        else { /* bsdf->distribution_type == NODE_MICROFACET_HAIR_BECKMANN*/
-          roughness *= 2.f / 3.f;
-        }
-
         bsdf->N = N;
         bsdf->roughness = roughness;
         bsdf->tilt = tilt;



More information about the Bf-blender-cvs mailing list