[Bf-blender-cvs] [8ba63026964] master: Geometry Nodes: fix combining field inputs

Jacques Lucke noreply at git.blender.org
Mon Dec 13 13:51:54 CET 2021


Commit: 8ba63026964bce2b8e454f50766627ce629a0da4
Author: Jacques Lucke
Date:   Mon Dec 13 13:51:28 2021 +0100
Branches: master
https://developer.blender.org/rB8ba63026964bce2b8e454f50766627ce629a0da4

Geometry Nodes: fix combining field inputs

This was an oversight in rB7b88a4a3ba7eb9b839afa6c42d070812a3af7997.

===================================================================

M	source/blender/functions/intern/field.cc

===================================================================

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_);
 }
 
 /* --------------------------------------------------------------------



More information about the Bf-blender-cvs mailing list