[Bf-blender-cvs] [fcfec33cf7d] temp-geometry-nodes-fields: Merge branch 'temp-geometry-nodes-fields--fields-jacques' into temp-geometry-nodes-fields

[Jacques Lucke]

Commit: fcfec33cf7d1d93784ad2f56e4c11a3f210a1469
Author: Jacques Lucke
Date:   Wed Sep 1 11:52:37 2021 +0200
Branches: temp-geometry-nodes-fields
https://developer.blender.org/rBfcfec33cf7d1d93784ad2f56e4c11a3f210a1469

Merge branch 'temp-geometry-nodes-fields--fields-jacques' into temp-geometry-nodes-fields

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



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

diff --cc source/blender/nodes/NOD_geometry_exec.hh
index c078e15fa55,6f0d12f3dba..7a0f18a876c
--- a/source/blender/nodes/NOD_geometry_exec.hh
+++ b/source/blender/nodes/NOD_geometry_exec.hh
@@@ -37,10 -37,12 +38,14 @@@ using bke::geometry_set_realize_instanc
  using bke::OutputAttribute;
  using bke::OutputAttribute_Typed;
  using bke::ReadAttributeLookup;
 +using bke::StrongAnonymousAttributeID;
 +using bke::WeakAnonymousAttributeID;
  using bke::WriteAttributeLookup;
  using fn::CPPType;
+ using fn::Field;
+ using fn::FieldInput;
+ using fn::FieldOperation;
+ using fn::GField;
  using fn::GMutablePointer;
  using fn::GMutableSpan;
  using fn::GPointer;