diff --git a/source/blender/editors/geometry/node_group_operator.cc b/source/blender/editors/geometry/node_group_operator.cc index b7feab0c783..ec5fd0259d7 100644 --- a/source/blender/editors/geometry/node_group_operator.cc +++ b/source/blender/editors/geometry/node_group_operator.cc @@ -431,7 +431,7 @@ static int run_node_group_invoke(bContext *C, wmOperator *op, const wmEvent * /* return OPERATOR_CANCELLED; } - nodes::update_input_properties_from_node_tree(*node_tree, op->properties, true, *op->properties); + nodes::update_input_properties_from_node_tree(*node_tree, op->properties, *op->properties); nodes::update_output_properties_from_node_tree(*node_tree, op->properties, *op->properties); return run_node_group_exec(C, op); diff --git a/source/blender/modifiers/intern/MOD_nodes.cc b/source/blender/modifiers/intern/MOD_nodes.cc index e13dd3791da..cf94c2fa613 100644 --- a/source/blender/modifiers/intern/MOD_nodes.cc +++ b/source/blender/modifiers/intern/MOD_nodes.cc @@ -336,8 +336,7 @@ static void update_id_properties_from_node_group(NodesModifierData *nmd) } IDProperty *new_properties = nmd->settings.properties; - nodes::update_input_properties_from_node_tree( - *nmd->node_group, old_properties, false, *new_properties); + nodes::update_input_properties_from_node_tree(*nmd->node_group, old_properties, *new_properties); nodes::update_output_properties_from_node_tree( *nmd->node_group, old_properties, *new_properties); diff --git a/source/blender/nodes/NOD_geometry_nodes_execute.hh b/source/blender/nodes/NOD_geometry_nodes_execute.hh index f7c95cc5409..204258fe091 100644 --- a/source/blender/nodes/NOD_geometry_nodes_execute.hh +++ b/source/blender/nodes/NOD_geometry_nodes_execute.hh @@ -66,7 +66,6 @@ bke::GeometrySet execute_geometry_nodes_on_geometry(const bNodeTree &btree, void update_input_properties_from_node_tree(const bNodeTree &tree, const IDProperty *old_properties, - bool use_bool_for_use_attribute, IDProperty &properties); void update_output_properties_from_node_tree(const bNodeTree &tree, diff --git a/source/blender/nodes/intern/geometry_nodes_execute.cc b/source/blender/nodes/intern/geometry_nodes_execute.cc index c4aef9448d1..6340d188e25 100644 --- a/source/blender/nodes/intern/geometry_nodes_execute.cc +++ b/source/blender/nodes/intern/geometry_nodes_execute.cc @@ -857,7 +857,6 @@ bke::GeometrySet execute_geometry_nodes_on_geometry(const bNodeTree &btree, void update_input_properties_from_node_tree(const bNodeTree &tree, const IDProperty *old_properties, - const bool use_bool_for_use_attribute, IDProperty &properties) { tree.ensure_interface_cache(); @@ -911,8 +910,7 @@ void update_input_properties_from_node_tree(const bNodeTree &tree, const std::string attribute_name_id = socket_identifier + input_attribute_name_suffix(); IDPropertyTemplate idprop = {0}; - IDProperty *use_attribute_prop = IDP_New( - use_bool_for_use_attribute ? IDP_BOOLEAN : IDP_INT, &idprop, use_attribute_id.c_str()); + IDProperty *use_attribute_prop = IDP_New(IDP_BOOLEAN, &idprop, use_attribute_id.c_str()); IDP_AddToGroup(&properties, use_attribute_prop); IDProperty *attribute_prop = IDP_New(IDP_STRING, &idprop, attribute_name_id.c_str());