Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacques Lucke <jacques@blender.org>2021-12-13 15:51:28 +0300
committerJacques Lucke <jacques@blender.org>2021-12-13 15:51:42 +0300
commit8ba63026964bce2b8e454f50766627ce629a0da4 (patch)
treefa3165d87e42fe3c3c88f91787b159d7fc569c49 /source/blender/functions
parent8709cbb73e7d76970780efa2cb6084c881809e2b (diff)
Geometry Nodes: fix combining field inputs
This was an oversight in rB7b88a4a3ba7eb9b839afa6c42d070812a3af7997.
Diffstat (limited to 'source/blender/functions')
-rw-r--r--source/blender/functions/intern/field.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/functions/intern/field.cc b/source/blender/functions/intern/field.cc
index a014fd113e4..5fa493c8336 100644
--- a/source/blender/functions/intern/field.cc
+++ b/source/blender/functions/intern/field.cc
@@ -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_);
}
/* --------------------------------------------------------------------