diff options
Diffstat (limited to 'source/blender/nodes')
-rw-r--r-- | source/blender/nodes/NOD_geometry_exec.hh | 8 | ||||
-rw-r--r-- | source/blender/nodes/NOD_geometry_nodes_eval_log.hh | 6 | ||||
-rw-r--r-- | source/blender/nodes/geometry/nodes/node_geo_transfer_attribute.cc | 4 |
3 files changed, 2 insertions, 16 deletions
diff --git a/source/blender/nodes/NOD_geometry_exec.hh b/source/blender/nodes/NOD_geometry_exec.hh index ce0c027da25..dc0965f5d71 100644 --- a/source/blender/nodes/NOD_geometry_exec.hh +++ b/source/blender/nodes/NOD_geometry_exec.hh @@ -38,14 +38,6 @@ using fn::FieldEvaluator; using fn::FieldInput; using fn::FieldOperation; using fn::GField; -using fn::GMutablePointer; -using fn::GMutableSpan; -using fn::GPointer; -using fn::GSpan; -using fn::GVArray; -using fn::GVArray_GSpan; -using fn::GVMutableArray; -using fn::GVMutableArray_GSpan; using fn::ValueOrField; using geometry_nodes_eval_log::NodeWarningType; diff --git a/source/blender/nodes/NOD_geometry_nodes_eval_log.hh b/source/blender/nodes/NOD_geometry_nodes_eval_log.hh index 492c67a236f..319fcdeebb7 100644 --- a/source/blender/nodes/NOD_geometry_nodes_eval_log.hh +++ b/source/blender/nodes/NOD_geometry_nodes_eval_log.hh @@ -18,13 +18,12 @@ #include "BLI_enumerable_thread_specific.hh" #include "BLI_function_ref.hh" +#include "BLI_generic_pointer.hh" #include "BLI_linear_allocator.hh" #include "BLI_map.hh" #include "BKE_geometry_set.hh" -#include "FN_generic_pointer.hh" - #include "NOD_derived_node_tree.hh" #include <chrono> @@ -34,9 +33,6 @@ struct SpaceSpreadsheet; namespace blender::nodes::geometry_nodes_eval_log { -using fn::GMutablePointer; -using fn::GPointer; - /** Contains information about a value that has been computed during geometry nodes evaluation. */ class ValueLog { public: diff --git a/source/blender/nodes/geometry/nodes/node_geo_transfer_attribute.cc b/source/blender/nodes/geometry/nodes/node_geo_transfer_attribute.cc index 2d5b0e58367..7f0ba950490 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_transfer_attribute.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_transfer_attribute.cc @@ -1,5 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0-or-later */ +#include "BLI_generic_array.hh" #include "BLI_kdopbvh.h" #include "BLI_task.hh" @@ -12,8 +13,6 @@ #include "BKE_mesh_runtime.h" #include "BKE_mesh_sample.hh" -#include "FN_generic_array.hh" - #include "UI_interface.h" #include "UI_resources.h" @@ -24,7 +23,6 @@ namespace blender::nodes::node_geo_transfer_attribute_cc { using namespace blender::bke::mesh_surface_sample; -using blender::fn::GArray; NODE_STORAGE_FUNCS(NodeGeometryTransferAttribute) |