blender
/
blender
136
406
Fork 589
Code Issues 6.2k Pull Requests 749 Projects 19 Wiki Activity

Geometry Nodes: do not crash when there are undefined nodes 

Undefined geometry nodes will just output a default value now.
This commit is contained in:
Jacques Lucke 2020-12-18 13:28:43 +01:00
parent 79d6bd9a22
commit c5569ba140
2 changed files with 38 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -300,13 +300,28 @@ class GeometryNodesEvaluator {
void execute_node(const DNode &node, GeoNodeExecParams params)
{
const bNode &bnode = params.node();
/* Use the geometry-node-execute callback if it exists. */
if (bnode.typeinfo->geometry_node_execute != nullptr) {
bnode.typeinfo->geometry_node_execute(params);
return;
}
/* Use the multi-function implementation of the node. */
const MultiFunction &fn = *mf_by_node_.lookup(&node);
/* Use the multi-function implementation if it exists. */
const MultiFunction *multi_function = mf_by_node_.lookup_default(&node, nullptr);
if (multi_function != nullptr) {
this->execute_multi_function_node(node, params, *multi_function);
return;
}
/* Just output default values if no implementation exists. */
this->execute_unknown_node(node, params);
}
void execute_multi_function_node(const DNode &node,
GeoNodeExecParams params,
const MultiFunction &fn)
{
MFContextBuilder fn_context;
MFParamsBuilder fn_params{fn, 1};
Vector<GMutablePointer> input_data;
@ -341,6 +356,16 @@ class GeometryNodesEvaluator {
}
}
void execute_unknown_node(const DNode &node, GeoNodeExecParams params)
{
for (const DOutputSocket *socket : node.outputs()) {
if (socket->is_available()) {
const CPPType &type = *blender::nodes::socket_cpp_type_get(*socket->typeinfo());
params.set_output_by_copy(socket->identifier(), {type, type.default_value()});
}
}
}
void forward_to_inputs(const DOutputSocket &from_socket, GMutablePointer value_to_forward)
{
Span<const DInputSocket *> to_sockets_all = from_socket.linked_sockets();

11
source/blender/nodes/NOD_geometry_exec.hh
View File

@ -44,6 +44,7 @@ using bke::WriteAttribute;
using bke::WriteAttributePtr;
using fn::CPPType;
using fn::GMutablePointer;
using fn::GPointer;
using fn::GValueMap;
class GeoNodeExecParams {
@ -123,6 +124,16 @@ class GeoNodeExecParams {
output_values_.add_new_by_move(identifier, value);
}
void set_output_by_copy(StringRef identifier, GPointer value)
{
#ifdef DEBUG
BLI_assert(value.type() != nullptr);
BLI_assert(value.get() != nullptr);
this->check_set_output(identifier, *value.type());
#endif
output_values_.add_new_by_copy(identifier, value);
}
/**
* Store the output value for the given socket identifier.
*/