[Bf-blender-cvs] [eea39133487] master: Merge branch 'blender-v3.4-release'

[Hans Goudey]

Commit: eea39133487873e35405023f53b59c5970ae7767
Author: Hans Goudey
Date:   Wed Nov 9 10:56:28 2022 -0600
Branches: master
https://developer.blender.org/rBeea39133487873e35405023f53b59c5970ae7767

Merge branch 'blender-v3.4-release'

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



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

diff --cc source/blender/nodes/geometry/nodes/node_geo_curve_trim.cc
index 3ec71877b7c,ea02fb9709f..b0c2f3117fa
--- a/source/blender/nodes/geometry/nodes/node_geo_curve_trim.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_curve_trim.cc
@@@ -19,6 -19,7 +19,7 @@@ NODE_STORAGE_FUNCS(NodeGeometryCurveTri
  static void node_declare(NodeDeclarationBuilder &b)
  {
    b.add_input<decl::Geometry>(N_("Curve")).supported_type(GEO_COMPONENT_TYPE_CURVE);
 -  // b.add_input<decl::Bool>(N_("Selection")).default_value(true).hide_value().supports_field();
++  b.add_input<decl::Bool>(N_("Selection")).default_value(true).hide_value().supports_field();
    b.add_input<decl::Float>(N_("Start"))
        .min(0.0f)
        .max(1.0f)
@@@ -64,7 -65,8 +65,7 @@@ static void node_update(bNodeTree *ntre
    const NodeGeometryCurveTrim &storage = node_storage(*node);
    const GeometryNodeCurveSampleMode mode = (GeometryNodeCurveSampleMode)storage.mode;
  
 -  // bNodeSocket *start_fac = static_cast<bNodeSocket *>(node->inputs.first)->next->next;
--  bNodeSocket *start_fac = static_cast<bNodeSocket *>(node->inputs.first)->next;
++  bNodeSocket *start_fac = static_cast<bNodeSocket *>(node->inputs.first)->next->next;
    bNodeSocket *end_fac = start_fac->next;
    bNodeSocket *start_len = end_fac->next;
    bNodeSocket *end_len = start_len->next;
@@@ -171,6 -154,8 +153,7 @@@ static void node_geo_exec(GeoNodeExecPa
    GeometrySet geometry_set = params.extract_input<GeometrySet>("Curve");
    GeometryComponentEditData::remember_deformed_curve_positions_if_necessary(geometry_set);
  
 -  // Field<bool> selection_field = params.extract_input<Field<bool>>("Selection");
 -  Field<bool> selection_field = fn::make_constant_field<bool>(true);
++  Field<bool> selection_field = params.extract_input<Field<bool>>("Selection");
    if (mode == GEO_NODE_CURVE_SAMPLE_FACTOR) {
      Field<float> start_field = params.extract_input<Field<float>>("Start");
      Field<float> end_field = params.extract_input<Field<float>>("End");