[Bf-blender-cvs] [f8d2e147098] temp-unity-build-test: cleanup
Jacques Lucke
noreply at git.blender.org
Fri Nov 5 14:48:42 CET 2021
Commit: f8d2e147098b8aeaafa22450f855201b6f40a898
Author: Jacques Lucke
Date: Fri Nov 5 14:46:32 2021 +0100
Branches: temp-unity-build-test
https://developer.blender.org/rBf8d2e147098b8aeaafa22450f855201b6f40a898
cleanup
===================================================================
M source/blender/blenkernel/BKE_volume_to_mesh.hh
M source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_clamp.cc
M source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_color_ramp.cc
M source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_combine_xyz.cc
M source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_compare.cc
M source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_curve_map.cc
M source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_fill.cc
M source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_map_range.cc
M source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_math.cc
M source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_mix.cc
M source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_sample_texture.cc
M source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_separate_xyz.cc
M source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_transfer.cc
M source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_vector_math.cc
M source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_vector_rotate.cc
M source/blender/nodes/geometry/nodes/legacy/node_geo_curve_endpoints.cc
M source/blender/nodes/geometry/nodes/legacy/node_geo_curve_select_by_handle_type.cc
M source/blender/nodes/geometry/nodes/legacy/node_geo_delete_geometry.cc
M source/blender/nodes/geometry/nodes/legacy/node_geo_subdivision_surface.cc
M source/blender/nodes/geometry/nodes/node_geo_delete_geometry.cc
M source/blender/nodes/geometry/nodes/node_geo_mesh_to_curve.cc
M source/blender/nodes/geometry/nodes/node_geo_mesh_to_points.cc
M source/blender/nodes/geometry/nodes/node_geo_points_to_volume.cc
M source/blender/nodes/geometry/nodes/node_geo_separate_components.cc
M source/blender/nodes/geometry/nodes/node_geo_subdivision_surface.cc
M source/blender/nodes/geometry/nodes/node_geo_volume_to_mesh.cc
===================================================================
diff --git a/source/blender/blenkernel/BKE_volume_to_mesh.hh b/source/blender/blenkernel/BKE_volume_to_mesh.hh
index 9532da8c23c..dd8ae7ea554 100644
--- a/source/blender/blenkernel/BKE_volume_to_mesh.hh
+++ b/source/blender/blenkernel/BKE_volume_to_mesh.hh
@@ -14,6 +14,8 @@
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
+#pragma once
+
#include "BLI_span.hh"
#include "DNA_modifier_types.h"
diff --git a/source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_clamp.cc b/source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_clamp.cc
index 46105b1b25a..eef94c51251 100644
--- a/source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_clamp.cc
+++ b/source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_clamp.cc
@@ -20,7 +20,7 @@
#include "node_geometry_util.hh"
-namespace blender::nodes::attribute_clamp_node {
+namespace blender::nodes::attribute_clamp_legacy_node {
static void geo_node_attribute_clamp_declare(NodeDeclarationBuilder &b)
{
@@ -262,7 +262,7 @@ static void geo_node_attribute_clamp_exec(GeoNodeExecParams params)
params.set_output("Geometry", geometry_set);
}
-} // namespace blender::nodes::attribute_clamp_node
+} // namespace blender::nodes::attribute_clamp_legacy_node
void register_node_type_geo_attribute_clamp()
{
@@ -270,12 +270,15 @@ void register_node_type_geo_attribute_clamp()
geo_node_type_base(
&ntype, GEO_NODE_LEGACY_ATTRIBUTE_CLAMP, "Attribute Clamp", NODE_CLASS_ATTRIBUTE, 0);
- node_type_init(&ntype, blender::nodes::attribute_clamp_node::geo_node_attribute_clamp_init);
- node_type_update(&ntype, blender::nodes::attribute_clamp_node::geo_node_attribute_clamp_update);
- ntype.declare = blender::nodes::attribute_clamp_node::geo_node_attribute_clamp_declare;
+ node_type_init(&ntype,
+ blender::nodes::attribute_clamp_legacy_node::geo_node_attribute_clamp_init);
+ node_type_update(&ntype,
+ blender::nodes::attribute_clamp_legacy_node::geo_node_attribute_clamp_update);
+ ntype.declare = blender::nodes::attribute_clamp_legacy_node::geo_node_attribute_clamp_declare;
ntype.geometry_node_execute =
- blender::nodes::attribute_clamp_node::geo_node_attribute_clamp_exec;
- ntype.draw_buttons = blender::nodes::attribute_clamp_node::geo_node_attribute_clamp_layout;
+ blender::nodes::attribute_clamp_legacy_node::geo_node_attribute_clamp_exec;
+ ntype.draw_buttons =
+ blender::nodes::attribute_clamp_legacy_node::geo_node_attribute_clamp_layout;
node_type_storage(
&ntype, "NodeAttributeClamp", node_free_standard_storage, node_copy_standard_storage);
nodeRegisterType(&ntype);
diff --git a/source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_color_ramp.cc b/source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_color_ramp.cc
index 4817b1d9985..e25008135c3 100644
--- a/source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_color_ramp.cc
+++ b/source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_color_ramp.cc
@@ -23,7 +23,7 @@
#include "node_geometry_util.hh"
-namespace blender::nodes::attribute_color_ramp_node {
+namespace blender::nodes::attribute_color_ramp_legacy_node {
static void geo_node_attribute_color_ramp_declare(NodeDeclarationBuilder &b)
{
@@ -119,7 +119,7 @@ static void geo_node_attribute_color_ramp_exec(GeoNodeExecParams params)
params.set_output("Geometry", std::move(geometry_set));
}
-} // namespace blender::nodes::attribute_color_ramp_node
+} // namespace blender::nodes::attribute_color_ramp_legacy_node
void register_node_type_geo_attribute_color_ramp()
{
@@ -132,13 +132,15 @@ void register_node_type_geo_attribute_color_ramp()
0);
node_type_storage(
&ntype, "NodeAttributeColorRamp", node_free_standard_storage, node_copy_standard_storage);
- node_type_init(&ntype,
- blender::nodes::attribute_color_ramp_node::geo_node_attribute_color_ramp_init);
+ node_type_init(
+ &ntype,
+ blender::nodes::attribute_color_ramp_legacy_node::geo_node_attribute_color_ramp_init);
node_type_size_preset(&ntype, NODE_SIZE_LARGE);
- ntype.declare = blender::nodes::attribute_color_ramp_node::geo_node_attribute_color_ramp_declare;
+ ntype.declare =
+ blender::nodes::attribute_color_ramp_legacy_node::geo_node_attribute_color_ramp_declare;
ntype.geometry_node_execute =
- blender::nodes::attribute_color_ramp_node::geo_node_attribute_color_ramp_exec;
+ blender::nodes::attribute_color_ramp_legacy_node::geo_node_attribute_color_ramp_exec;
ntype.draw_buttons =
- blender::nodes::attribute_color_ramp_node::geo_node_attribute_color_ramp_layout;
+ blender::nodes::attribute_color_ramp_legacy_node::geo_node_attribute_color_ramp_layout;
nodeRegisterType(&ntype);
}
diff --git a/source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_combine_xyz.cc b/source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_combine_xyz.cc
index 9d8d5dab127..c097ce596ef 100644
--- a/source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_combine_xyz.cc
+++ b/source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_combine_xyz.cc
@@ -19,7 +19,7 @@
#include "node_geometry_util.hh"
-namespace blender::nodes::attribute_combine_xyz_node {
+namespace blender::nodes::attribute_combine_xyz_legacy_node {
static void geo_node_attribute_combine_xyz_declare(NodeDeclarationBuilder &b)
{
@@ -130,7 +130,7 @@ static void geo_node_attribute_combine_xyz_exec(GeoNodeExecParams params)
params.set_output("Geometry", geometry_set);
}
-} // namespace blender::nodes::attribute_combine_xyz_node
+} // namespace blender::nodes::attribute_combine_xyz_legacy_node
void register_node_type_geo_attribute_combine_xyz()
{
@@ -141,18 +141,20 @@ void register_node_type_geo_attribute_combine_xyz()
"Attribute Combine XYZ",
NODE_CLASS_ATTRIBUTE,
0);
- node_type_init(&ntype,
- blender::nodes::attribute_combine_xyz_node::geo_node_attribute_combine_xyz_init);
+ node_type_init(
+ &ntype,
+ blender::nodes::attribute_combine_xyz_legacy_node::geo_node_attribute_combine_xyz_init);
node_type_update(
- &ntype, blender::nodes::attribute_combine_xyz_node::geo_node_attribute_combine_xyz_update);
+ &ntype,
+ blender::nodes::attribute_combine_xyz_legacy_node::geo_node_attribute_combine_xyz_update);
node_type_storage(
&ntype, "NodeAttributeCombineXYZ", node_free_standard_storage, node_copy_standard_storage);
ntype.declare =
- blender::nodes::attribute_combine_xyz_node::geo_node_attribute_combine_xyz_declare;
+ blender::nodes::attribute_combine_xyz_legacy_node::geo_node_attribute_combine_xyz_declare;
ntype.geometry_node_execute =
- blender::nodes::attribute_combine_xyz_node::geo_node_attribute_combine_xyz_exec;
+ blender::nodes::attribute_combine_xyz_legacy_node::geo_node_attribute_combine_xyz_exec;
ntype.draw_buttons =
- blender::nodes::attribute_combine_xyz_node::geo_node_attribute_combine_xyz_layout;
+ blender::nodes::attribute_combine_xyz_legacy_node::geo_node_attribute_combine_xyz_layout;
nodeRegisterType(&ntype);
}
diff --git a/source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_compare.cc b/source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_compare.cc
index fb9ed3485f1..98aa29b45d9 100644
--- a/source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_compare.cc
+++ b/source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_compare.cc
@@ -21,7 +21,7 @@
#include "node_geometry_util.hh"
-namespace blender::nodes::attribute_compare_node {
+namespace blender::nodes::attribute_compare_legacy_node {
static void geo_node_attribute_compare_declare(NodeDeclarationBuilder &b)
{
@@ -341,7 +341,7 @@ static void geo_node_attribute_compare_exec(GeoNodeExecParams params)
params.set_output("Geometry", geometry_set);
}
-} // namespace blender::nodes::attribute_compare_node
+} // namespace blender::nodes::attribute_compare_legacy_node
void register_node_type_geo_attribute_compare()
{
@@ -349,14 +349,17 @@ void register_node_type_geo_attribute_compare()
geo_node_type_base(
&ntype, GEO_NODE_LEGACY_ATTRIBUTE_COMPARE, "Attribute Compare", NODE_CLASS_ATTRIBUTE, 0);
- ntype.declare = blender::nodes::attribute_compare_node::geo_node_attribute_compare_declare;
+ ntype.declare =
+ blender::nodes::attribute_compare_legacy_node::geo_node_attribute_compare_declare;
ntype.geometry_node_execute =
- blender::nodes::attribute_compare_node::geo_node_attribute_compare_exec;
- ntype.draw_buttons = blender::nodes::attribute_compare_node::geo_node_attribute_compare_layout;
- node_type_update(&ntype,
- blender::nodes::attribute_compare_node::geo_node_attribute_compare_update);
+ blender::nodes::attribute_compare_legacy_node::geo_node_attribute_compare_exec;
+ ntype.draw_buttons =
+ blender::nodes::attribute_compare_legacy_node::geo_node_attribute_compare_layout;
+ node_type_update(
+ &ntype, blender::nodes::attribute_compare_legacy_node::geo_node_attribute_compare_update);
node_type_storage(
&ntype, "NodeAttributeCompare", node_free_standard_storage, node_copy_standard_storage);
- node_type_init(&ntype, blender::nodes::attribute_compare_node::geo_node_attribute_compare_init);
+ node_type_init(&ntype,
+ blender::nodes::attribute_compare_legacy_node::geo_node_attribute_compare_init);
nodeRegisterType(&ntype);
}
diff --git a/source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_curve_map.cc b/source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_curve_map.cc
index 97eb72b4e32..0109d45db15 100644
--- a/source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_curve_map.cc
+++ b/source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_curve_map.cc
@@ -24,7 +24,7 @@
#include "node_geometry_util.hh"
-namespace blender::nodes::attribute_curve_map_node {
+namespace blender::nodes::attribute_curve_map_legacy_node {
static void geo_node_attribute_curve_map_declare(NodeDeclarationBuilder &b)
{
@@
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list