blender/blender
168
526
Fork 801
Code Issues 6.6k Pull Requests 962 Projects 21 Wiki Activity

Geometry Nodes: Skip unused output of multifunction #121799

Merged
Jacques Lucke merged 2 commits from mod_moder/blender:skip_unused_single_output_mf into main 2024-05-28 12:00:26 +02:00
Conversation 1 Commits 2 Files Changed 1 +16 -2
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
source/blender/nodes/intern/geometry_nodes_lazy_function.cc
View File

@ -546,6 +546,9 @@ static void execute_multi_function_on_value_variant(const MultiFunction &fn,
/* Store the new fields in the output. */
for (const int i : output_values.index_range()) {
if (output_values[i] == nullptr) {
continue;
}
output_values[i]->set(GField{operation, i});
}
}
@ -564,6 +567,10 @@ static void execute_multi_function_on_value_variant(const MultiFunction &fn,
params.add_readonly_single_input(GPointer{cpp_type, value});
}
for (const int i : output_values.index_range()) {
if (output_values[i] == nullptr) {
params.add_ignored_single_output("");
continue;
}
SocketValueVariant &output_variant = *output_values[i];
const mf::DataType data_type = fn.param_type(params.next_param_index()).data_type();
const CPPType &cpp_type = data_type.single_type();
@ -718,12 +725,19 @@ class LazyFunctionForMultiFunctionNode : public LazyFunction {
input_values[i] = params.try_get_input_data_ptr<SocketValueVariant>(i);
}
for (const int i : outputs_.index_range()) {
output_values[i] = new (params.get_output_data_ptr(i)) SocketValueVariant();
if (params.get_output_usage(i) != lf::ValueUsage::Unused) {
output_values[i] = new (params.get_output_data_ptr(i)) SocketValueVariant();
}
else {
output_values[i] = nullptr;
}
}
execute_multi_function_on_value_variant(
*fn_item_.fn, fn_item_.owned_fn, input_values, output_values);
for (const int i : outputs_.index_range()) {
params.output_set(i);
if (params.get_output_usage(i) != lf::ValueUsage::Unused) {
params.output_set(i);
}
}
}
};