blender
/
blender
136
407
Fork 589
Code Issues 6.3k Pull Requests 767 Projects 19 Wiki Activity

Geometry Nodes: Use boolean type for "use attribute" inputs #119129

Merged
Hans Goudey merged 1 commits from HooglyBoogly/blender:geometry-nodes-use-attribute-bool into main 2024-03-08 17:49:21 +01:00
Conversation 1 Commits 1 Files Changed 4 +3 -7
4 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/editors/geometry/node_group_operator.cc
View File

@ -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);

3
source/blender/modifiers/intern/MOD_nodes.cc
View File

@ -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);

1
source/blender/nodes/NOD_geometry_nodes_execute.hh
View File

@ -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,

4
source/blender/nodes/intern/geometry_nodes_execute.cc
View File

@ -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());