[Bf-blender-cvs] [08684b2601c] microfacet_hair: Merge branch 'master' into microfacet_hair

[Weizhen Huang]

Commit: 08684b2601c7c1826e9214d519670bebb0d6f527
Author: Weizhen Huang
Date:   Tue Jan 10 13:24:52 2023 +0100
Branches: microfacet_hair
https://developer.blender.org/rB08684b2601c7c1826e9214d519670bebb0d6f527

Merge branch 'master' into microfacet_hair

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



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

diff --cc source/blender/blenkernel/intern/geometry_component_curves.cc
index 5a6551f0c8e,075a6838704..44f662300fc
--- a/source/blender/blenkernel/intern/geometry_component_curves.cc
+++ b/source/blender/blenkernel/intern/geometry_component_curves.cc
@@@ -505,12 -501,12 +505,12 @@@ static ComponentAttributeProviders crea
                                                      tag_component_topology_changed,
                                                      AttributeValidator{&nurbs_order_clamp});
  
-   static const fn::CustomMF_SI_SO<int8_t, int8_t> normal_mode_clamp{
+   static const auto normal_mode_clamp = mf::build::SI1_SO<int8_t, int8_t>(
        "Normal Mode Validate",
        [](int8_t value) {
 -        return std::clamp<int8_t>(value, NORMAL_MODE_MINIMUM_TWIST, NORMAL_MODE_Z_UP);
 +        return std::clamp<int8_t>(value, NORMAL_MODE_MINIMUM_TWIST, NORMAL_MODE_CURVATURE_VECTOR);
        },
-       fn::CustomMF_presets::AllSpanOrSingle()};
+       mf::build::exec_presets::AllSpanOrSingle());
    static BuiltinCustomDataLayerProvider normal_mode("normal_mode",
                                                      ATTR_DOMAIN_CURVE,
                                                      CD_PROP_INT8,