blender
/
blender
134
398
Fork 580
Code Issues 6.3k Pull Requests 759 Projects 19 Wiki Activity

Fix crash on inserting links on simulation zone nodes. #107303

Merged
Lukas Tönne merged 1 commits from LukasTonne/blender:geometry-nodes-simulation-fix-link-insert into geometry-nodes-simulation 2023-04-24 16:14:46 +02:00
Conversation 0 Commits 1 Files Changed 3 +16 -6
3 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
source/blender/nodes/geometry/node_geometry_util.hh
View File

@ -133,6 +133,7 @@ class FieldAtIndexInput final : public bke::GeometryFieldInput {
}
};
std::string socket_identifier_for_simulation_item(const NodeSimulationItem &item);
void socket_declarations_for_simulation_items(Span<NodeSimulationItem> items,
NodeDeclaration &r_declaration);
const CPPType &get_simulation_item_cpp_type(const NodeSimulationItem &item);

6
source/blender/nodes/geometry/nodes/node_geo_simulation_input.cc
View File

@ -146,7 +146,8 @@ static bool node_insert_link(bNodeTree *ntree, bNode *node, bNodeLink *link)
if (const NodeSimulationItem *item = NOD_geometry_simulation_output_add_item_from_socket(
&storage, link->fromnode, link->fromsock)) {
update_node_declaration_and_sockets(*ntree, *node);
link->tosock = nodeFindSocket(node, SOCK_IN, item->name);
link->tosock = nodeFindSocket(
node, SOCK_IN, socket_identifier_for_simulation_item(*item).c_str());
}
else {
return false;
@ -159,7 +160,8 @@ static bool node_insert_link(bNodeTree *ntree, bNode *node, bNodeLink *link)
if (const NodeSimulationItem *item = NOD_geometry_simulation_output_add_item_from_socket(
&storage, link->tonode, link->tosock)) {
update_node_declaration_and_sockets(*ntree, *node);
link->fromsock = nodeFindSocket(node, SOCK_OUT, item->name);
link->fromsock = nodeFindSocket(
node, SOCK_OUT, socket_identifier_for_simulation_item(*item).c_str());
}
else {
return false;

15
source/blender/nodes/geometry/nodes/node_geo_simulation_output.cc
View File

@ -16,6 +16,11 @@
namespace blender::nodes {
std::string socket_identifier_for_simulation_item(const NodeSimulationItem &item)
{
return "Item_" + std::to_string(item.identifier);
}
void socket_declarations_for_simulation_items(const Span<NodeSimulationItem> items,
NodeDeclaration &r_declaration)
{
@ -25,14 +30,14 @@ void socket_declarations_for_simulation_items(const Span<NodeSimulationItem> ite
{
std::unique_ptr<decl::Geometry> decl = std::make_unique<decl::Geometry>();
decl->name = item.name ? item.name : "";
decl->identifier = "Item_" + std::to_string(item.identifier);
decl->identifier = socket_identifier_for_simulation_item(item);
decl->in_out = SOCK_IN;
r_declaration.inputs.append(std::move(decl));
}
{
std::unique_ptr<decl::Geometry> decl = std::make_unique<decl::Geometry>();
decl->name = item.name ? item.name : "";
decl->identifier = "Item_" + std::to_string(item.identifier);
decl->identifier = socket_identifier_for_simulation_item(item);
decl->in_out = SOCK_OUT;
r_declaration.outputs.append(std::move(decl));
}
@ -301,7 +306,8 @@ static bool node_insert_link(bNodeTree *ntree, bNode *node, bNodeLink *link)
if (const NodeSimulationItem *item = NOD_geometry_simulation_output_add_item_from_socket(
&storage, link->fromnode, link->fromsock)) {
update_node_declaration_and_sockets(*ntree, *node);
link->tosock = nodeFindSocket(node, SOCK_IN, item->name);
link->tosock = nodeFindSocket(
node, SOCK_IN, socket_identifier_for_simulation_item(*item).c_str());
}
else {
return false;
@ -314,7 +320,8 @@ static bool node_insert_link(bNodeTree *ntree, bNode *node, bNodeLink *link)
if (const NodeSimulationItem *item = NOD_geometry_simulation_output_add_item_from_socket(
&storage, link->fromnode, link->tosock)) {
update_node_declaration_and_sockets(*ntree, *node);
link->fromsock = nodeFindSocket(node, SOCK_OUT, item->name);
link->fromsock = nodeFindSocket(
node, SOCK_OUT, socket_identifier_for_simulation_item(*item).c_str());
}
else {
return false;