[Bf-blender-cvs] [8fa69dafdd2] master: Cleanup: Remove unnecessary using keyword and namespace
Hans Goudey
noreply at git.blender.org
Fri Nov 18 20:43:21 CET 2022
Commit: 8fa69dafdd2e57f6784fd3c16a98feb08c5ee0ad
Author: Hans Goudey
Date: Fri Nov 18 13:05:55 2022 -0600
Branches: master
https://developer.blender.org/rB8fa69dafdd2e57f6784fd3c16a98feb08c5ee0ad
Cleanup: Remove unnecessary using keyword and namespace
===================================================================
M source/blender/editors/space_node/node_draw.cc
M source/blender/editors/space_spreadsheet/spreadsheet_data_source_geometry.cc
M source/blender/nodes/function/nodes/node_fn_slice_string.cc
M source/blender/nodes/geometry/nodes/node_geo_curve_sample.cc
M source/blender/nodes/geometry/nodes/node_geo_proximity.cc
M source/blender/nodes/geometry/nodes/node_geo_raycast.cc
M source/blender/nodes/geometry/nodes/node_geo_sample_nearest.cc
M source/blender/nodes/geometry/nodes/node_geo_sample_nearest_surface.cc
===================================================================
diff --git a/source/blender/editors/space_node/node_draw.cc b/source/blender/editors/space_node/node_draw.cc
index 434c2168976..3b869a6d55a 100644
--- a/source/blender/editors/space_node/node_draw.cc
+++ b/source/blender/editors/space_node/node_draw.cc
@@ -83,7 +83,6 @@ namespace geo_log = blender::nodes::geo_eval_log;
using blender::GPointer;
using blender::Vector;
-using blender::fn::GField;
extern "C" {
/* XXX interface.h */
diff --git a/source/blender/editors/space_spreadsheet/spreadsheet_data_source_geometry.cc b/source/blender/editors/space_spreadsheet/spreadsheet_data_source_geometry.cc
index 59a8daf4f4a..024b140a426 100644
--- a/source/blender/editors/space_spreadsheet/spreadsheet_data_source_geometry.cc
+++ b/source/blender/editors/space_spreadsheet/spreadsheet_data_source_geometry.cc
@@ -43,7 +43,6 @@
#include "spreadsheet_data_source_geometry.hh"
#include "spreadsheet_intern.hh"
-using blender::fn::GField;
using blender::nodes::geo_eval_log::ViewerNodeLog;
namespace blender::ed::spreadsheet {
diff --git a/source/blender/nodes/function/nodes/node_fn_slice_string.cc b/source/blender/nodes/function/nodes/node_fn_slice_string.cc
index 4a111ac949a..8d6dc8dcb2a 100644
--- a/source/blender/nodes/function/nodes/node_fn_slice_string.cc
+++ b/source/blender/nodes/function/nodes/node_fn_slice_string.cc
@@ -16,7 +16,7 @@ static void fn_node_slice_string_declare(NodeDeclarationBuilder &b)
static void fn_node_slice_string_build_multi_function(NodeMultiFunctionBuilder &builder)
{
- static blender::fn::CustomMF_SI_SI_SI_SO<std::string, int, int, std::string> slice_fn{
+ static fn::CustomMF_SI_SI_SI_SO<std::string, int, int, std::string> slice_fn{
"Slice", [](const std::string &str, int a, int b) {
const int len = BLI_strlen_utf8(str.c_str());
const int start = BLI_str_utf8_offset_from_index(str.c_str(), std::clamp(a, 0, len));
diff --git a/source/blender/nodes/geometry/nodes/node_geo_curve_sample.cc b/source/blender/nodes/geometry/nodes/node_geo_curve_sample.cc
index c1f631a86fa..de9691cb56e 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_curve_sample.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_curve_sample.cc
@@ -268,7 +268,7 @@ class SampleCurveFunction : public fn::MultiFunction {
fn::MFSignature create_signature()
{
- blender::fn::MFSignatureBuilder signature{"Sample Curve"};
+ fn::MFSignatureBuilder signature{"Sample Curve"};
signature.single_input<int>("Curve Index");
signature.single_input<float>("Length");
signature.single_output<float3>("Position");
diff --git a/source/blender/nodes/geometry/nodes/node_geo_proximity.cc b/source/blender/nodes/geometry/nodes/node_geo_proximity.cc
index 92a409f9db6..50e5ac1885b 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_proximity.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_proximity.cc
@@ -144,7 +144,7 @@ class ProximityFunction : public fn::MultiFunction {
static fn::MFSignature create_signature()
{
- blender::fn::MFSignatureBuilder signature{"Geometry Proximity"};
+ fn::MFSignatureBuilder signature{"Geometry Proximity"};
signature.single_input<float3>("Source Position");
signature.single_output<float3>("Position");
signature.single_output<float>("Distance");
diff --git a/source/blender/nodes/geometry/nodes/node_geo_raycast.cc b/source/blender/nodes/geometry/nodes/node_geo_raycast.cc
index e4e346cf596..61fa75cbdda 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_raycast.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_raycast.cc
@@ -231,7 +231,7 @@ class RaycastFunction : public fn::MultiFunction {
fn::MFSignature create_signature()
{
- blender::fn::MFSignatureBuilder signature{"Geometry Proximity"};
+ fn::MFSignatureBuilder signature{"Geometry Proximity"};
signature.single_input<float3>("Source Position");
signature.single_input<float3>("Ray Direction");
signature.single_input<float>("Ray Length");
diff --git a/source/blender/nodes/geometry/nodes/node_geo_sample_nearest.cc b/source/blender/nodes/geometry/nodes/node_geo_sample_nearest.cc
index 7028b013dc6..4717634814b 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_sample_nearest.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_sample_nearest.cc
@@ -256,7 +256,7 @@ class SampleNearestFunction : public fn::MultiFunction {
fn::MFSignature create_signature()
{
- blender::fn::MFSignatureBuilder signature{"Sample Nearest"};
+ fn::MFSignatureBuilder signature{"Sample Nearest"};
signature.single_input<float3>("Position");
signature.single_output<int>("Index");
return signature.build();
diff --git a/source/blender/nodes/geometry/nodes/node_geo_sample_nearest_surface.cc b/source/blender/nodes/geometry/nodes/node_geo_sample_nearest_surface.cc
index 503f6264191..b588909a5ff 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_sample_nearest_surface.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_sample_nearest_surface.cc
@@ -146,7 +146,7 @@ class SampleNearestSurfaceFunction : public fn::MultiFunction {
fn::MFSignature create_signature()
{
- blender::fn::MFSignatureBuilder signature{"Sample Nearest Surface"};
+ fn::MFSignatureBuilder signature{"Sample Nearest Surface"};
signature.single_input<float3>("Position");
signature.single_output("Value", src_field_.cpp_type());
return signature.build();
More information about the Bf-blender-cvs
mailing list