griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Geometry Nodes: fix combining field inputs

Browse Source 
This was an oversight in rB7b88a4a3ba7eb9b839afa6c42d070812a3af7997.
This commit is contained in:
Jacques Lucke
2021-12-13 13:51:28 +01:00
parent 8709cbb73e
commit 8ba6302696
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/functions/intern/field.cc
View File

@@ -571,7 +571,7 @@ static std::shared_ptr<const FieldInputs> combine_field_inputs(Span<GField> fiel
/* None of the field depends on an input. */
return {};
}
/* Check if all inputs are in the */
/* Check if all inputs are in the candidate. */
Vector<const FieldInput *> inputs_not_in_candidate;
for (const GField &field : fields) {
const std::shared_ptr<const FieldInputs> &field_inputs = field.node().field_inputs();
@@ -604,7 +604,7 @@ static std::shared_ptr<const FieldInputs> combine_field_inputs(Span<GField> fiel
FieldOperation::FieldOperation(const MultiFunction &function, Vector<GField> inputs)
: FieldNode(false), function_(&function), inputs_(std::move(inputs))
{
field_inputs_ = combine_field_inputs(inputs);
field_inputs_ = combine_field_inputs(inputs_);
}
/* --------------------------------------------------------------------