blender/blender
154
489
Fork 725
Code Issues 6.7k Pull Requests 886 Projects 18 Wiki Activity

Fix: Remove support for node tool data-block inputs for 4.0 #114621

Merged
Hans Goudey merged 1 commits from HooglyBoogly/blender:fix-node-group-operator-bad-data-blocks into blender-v4.0-release 2023-11-08 10:47:08 +01:00
Conversation 0 Commits 1 Files Changed 1 +13
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -330,6 +330,19 @@ static int run_node_group_exec(bContext *C, wmOperator *op)
BKE_report(op->reports, RPT_ERROR, "Node group must have a group output node");
return OPERATOR_CANCELLED;
}
for (const bNodeTreeInterfaceSocket *input : node_tree->interface_inputs()) {
if (STR_ELEM(input->socket_type,
"NodeSocketObject",
"NodeSocketImage",
"NodeSocketGeometry",
"NodeSocketCollection",
"NodeSocketTexture",
"NodeSocketMaterial"))
{
BKE_report(op->reports, RPT_ERROR, "Data-block inputs are unsupported");
return OPERATOR_CANCELLED;
}
}
IDProperty *properties = replace_inputs_evaluated_data_blocks(*op->properties, *depsgraph);
BLI_SCOPED_DEFER([&]() { IDP_FreeProperty_ex(properties, false); });