[Bf-blender-cvs] [aa440923c8a] master: Fix: Hide selection value in resample curve node, fix order

Hans Goudey noreply at git.blender.org
Wed Nov 10 00:23:25 CET 2021


Commit: aa440923c8a3b3cf8bfc6e208f47f251863bff82
Author: Hans Goudey
Date:   Tue Nov 9 17:23:11 2021 -0600
Branches: master
https://developer.blender.org/rBaa440923c8a3b3cf8bfc6e208f47f251863bff82

Fix: Hide selection value in resample curve node, fix order

Selection sockets are meant to come right after the geometry,
this was missed in review of rBa7672caeb255e3.
Also, the selection value was not hidden.

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

M	source/blender/nodes/geometry/nodes/node_geo_curve_resample.cc

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

diff --git a/source/blender/nodes/geometry/nodes/node_geo_curve_resample.cc b/source/blender/nodes/geometry/nodes/node_geo_curve_resample.cc
index fb2021c307b..4dad3d22283 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_curve_resample.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_curve_resample.cc
@@ -35,13 +35,13 @@ namespace blender::nodes {
 static void geo_node_curve_resample_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).supports_field().hide_value();
   b.add_input<decl::Int>(N_("Count")).default_value(10).min(1).max(100000).supports_field();
   b.add_input<decl::Float>(N_("Length"))
       .default_value(0.1f)
       .min(0.001f)
       .supports_field()
       .subtype(PROP_DISTANCE);
-  b.add_input<decl::Bool>(N_("Selection")).default_value(true).supports_field();
   b.add_output<decl::Geometry>(N_("Curve"));
 }
 
@@ -64,7 +64,7 @@ static void geo_node_curve_resample_update(bNodeTree *UNUSED(ntree), bNode *node
   NodeGeometryCurveResample &node_storage = *(NodeGeometryCurveResample *)node->storage;
   const GeometryNodeCurveResampleMode mode = (GeometryNodeCurveResampleMode)node_storage.mode;
 
-  bNodeSocket *count_socket = ((bNodeSocket *)node->inputs.first)->next;
+  bNodeSocket *count_socket = ((bNodeSocket *)node->inputs.first)->next->next;
   bNodeSocket *length_socket = count_socket->next;
 
   nodeSetSocketAvailability(count_socket, mode == GEO_NODE_CURVE_RESAMPLE_COUNT);



More information about the Bf-blender-cvs mailing list