[Bf-blender-cvs] [5d160dec3b8] master: Geometry Nodes: move legacy nodes to separate folder

Jacques Lucke noreply at git.blender.org
Tue Sep 28 11:34:36 CEST 2021 

Commit: 5d160dec3b8d469994ea9c6c22bd8100789d8c1e
Author: Jacques Lucke
Date:   Tue Sep 28 11:31:35 2021 +0200
Branches: master
https://developer.blender.org/rB5d160dec3b8d469994ea9c6c22bd8100789d8c1e

Geometry Nodes: move legacy nodes to separate folder

Previously, we were moving them one by one. It's a lot easier
to just move all files at the same time.

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

M	source/blender/blenkernel/BKE_node.h
M	source/blender/blenloader/intern/versioning_300.c
M	source/blender/nodes/CMakeLists.txt
M	source/blender/nodes/NOD_static_types.h
R100	source/blender/nodes/geometry/nodes/node_geo_align_rotation_to_vector.cc	source/blender/nodes/geometry/nodes/legacy/node_geo_align_rotation_to_vector.cc
R099	source/blender/nodes/geometry/nodes/node_geo_attribute_clamp.cc	source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_clamp.cc
R100	source/blender/nodes/geometry/nodes/node_geo_attribute_color_ramp.cc	source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_color_ramp.cc
R100	source/blender/nodes/geometry/nodes/node_geo_attribute_combine_xyz.cc	source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_combine_xyz.cc
R100	source/blender/nodes/geometry/nodes/node_geo_attribute_compare.cc	source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_compare.cc
R100	source/blender/nodes/geometry/nodes/node_geo_attribute_convert.cc	source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_convert.cc
R100	source/blender/nodes/geometry/nodes/node_geo_attribute_curve_map.cc	source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_curve_map.cc
R100	source/blender/nodes/geometry/nodes/node_geo_attribute_fill.cc	source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_fill.cc
R100	source/blender/nodes/geometry/nodes/node_geo_attribute_map_range.cc	source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_map_range.cc
R100	source/blender/nodes/geometry/nodes/node_geo_attribute_math.cc	source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_math.cc
R100	source/blender/nodes/geometry/nodes/node_geo_attribute_mix.cc	source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_mix.cc
R100	source/blender/nodes/geometry/nodes/node_geo_attribute_proximity.cc	source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_proximity.cc
R100	source/blender/nodes/geometry/nodes/node_geo_attribute_sample_texture.cc	source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_sample_texture.cc
R100	source/blender/nodes/geometry/nodes/node_geo_attribute_separate_xyz.cc	source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_separate_xyz.cc
R100	source/blender/nodes/geometry/nodes/node_geo_attribute_transfer.cc	source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_transfer.cc
R100	source/blender/nodes/geometry/nodes/node_geo_attribute_vector_math.cc	source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_vector_math.cc
R099	source/blender/nodes/geometry/nodes/node_geo_attribute_vector_rotate.cc	source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_vector_rotate.cc
R100	source/blender/nodes/geometry/nodes/node_geo_curve_reverse.cc	source/blender/nodes/geometry/nodes/legacy/node_geo_curve_reverse.cc
R100	source/blender/nodes/geometry/nodes/node_geo_curve_select_by_handle_type.cc	source/blender/nodes/geometry/nodes/legacy/node_geo_curve_select_by_handle_type.cc
R100	source/blender/nodes/geometry/nodes/node_geo_curve_set_handles.cc	source/blender/nodes/geometry/nodes/legacy/node_geo_curve_set_handles.cc
R100	source/blender/nodes/geometry/nodes/node_geo_curve_spline_type.cc	source/blender/nodes/geometry/nodes/legacy/node_geo_curve_spline_type.cc
R100	source/blender/nodes/geometry/nodes/node_geo_curve_subdivide.cc	source/blender/nodes/geometry/nodes/legacy/node_geo_curve_subdivide.cc
R100	source/blender/nodes/geometry/nodes/node_geo_delete_geometry.cc	source/blender/nodes/geometry/nodes/legacy/node_geo_delete_geometry.cc
R100	source/blender/nodes/geometry/nodes/node_geo_mesh_to_curve.cc	source/blender/nodes/geometry/nodes/legacy/node_geo_mesh_to_curve.cc
R100	source/blender/nodes/geometry/nodes/node_geo_point_rotate.cc	source/blender/nodes/geometry/nodes/legacy/node_geo_point_rotate.cc
R100	source/blender/nodes/geometry/nodes/node_geo_point_scale.cc	source/blender/nodes/geometry/nodes/legacy/node_geo_point_scale.cc
R100	source/blender/nodes/geometry/nodes/node_geo_point_separate.cc	source/blender/nodes/geometry/nodes/legacy/node_geo_point_separate.cc
R100	source/blender/nodes/geometry/nodes/node_geo_point_translate.cc	source/blender/nodes/geometry/nodes/legacy/node_geo_point_translate.cc
R100	source/blender/nodes/geometry/nodes/node_geo_points_to_volume.cc	source/blender/nodes/geometry/nodes/legacy/node_geo_points_to_volume.cc
R100	source/blender/nodes/geometry/nodes/node_geo_raycast.cc	source/blender/nodes/geometry/nodes/legacy/node_geo_raycast.cc

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

diff --git a/source/blender/blenkernel/BKE_node.h b/source/blender/blenkernel/BKE_node.h
index 5491f2a3de9..eb146231b41 100644
--- a/source/blender/blenkernel/BKE_node.h
+++ b/source/blender/blenkernel/BKE_node.h
@@ -1451,14 +1451,14 @@ int ntreeTexExecTree(struct bNodeTree *ntree,
 #define GEO_NODE_MESH_PRIMITIVE_LINE 1038
 #define GEO_NODE_MESH_PRIMITIVE_GRID 1039
 #define GEO_NODE_LEGACY_ATTRIBUTE_MAP_RANGE 1040
-#define GEO_NODE_LECAGY_ATTRIBUTE_CLAMP 1041
+#define GEO_NODE_LEGACY_ATTRIBUTE_CLAMP 1041
 #define GEO_NODE_BOUNDING_BOX 1042
 #define GEO_NODE_SWITCH 1043
 #define GEO_NODE_LEGACY_ATTRIBUTE_TRANSFER 1044
 #define GEO_NODE_CURVE_TO_MESH 1045
 #define GEO_NODE_LEGACY_ATTRIBUTE_CURVE_MAP 1046
 #define GEO_NODE_CURVE_RESAMPLE 1047
-#define GEO_NODE_ATTRIBUTE_VECTOR_ROTATE 1048
+#define GEO_NODE_LEGACY_ATTRIBUTE_VECTOR_ROTATE 1048
 #define GEO_NODE_LEGACY_MATERIAL_ASSIGN 1049
 #define GEO_NODE_INPUT_MATERIAL 1050
 #define GEO_NODE_MATERIAL_REPLACE 1051
diff --git a/source/blender/blenloader/intern/versioning_300.c b/source/blender/blenloader/intern/versioning_300.c
index b86f98af4f1..26903fff70f 100644
--- a/source/blender/blenloader/intern/versioning_300.c
+++ b/source/blender/blenloader/intern/versioning_300.c
@@ -753,10 +753,10 @@ static bool geometry_node_is_293_legacy(const short node_type)
     case GEO_NODE_LEGACY_ALIGN_ROTATION_TO_VECTOR:
     case GEO_NODE_LEGACY_POINT_SCALE:
     case GEO_NODE_LEGACY_ATTRIBUTE_SAMPLE_TEXTURE:
-    case GEO_NODE_ATTRIBUTE_VECTOR_ROTATE:
+    case GEO_NODE_LEGACY_ATTRIBUTE_VECTOR_ROTATE:
     case GEO_NODE_LEGACY_ATTRIBUTE_CURVE_MAP:
     case GEO_NODE_LEGACY_ATTRIBUTE_MAP_RANGE:
-    case GEO_NODE_LECAGY_ATTRIBUTE_CLAMP:
+    case GEO_NODE_LEGACY_ATTRIBUTE_CLAMP:
     case GEO_NODE_LEGACY_ATTRIBUTE_VECTOR_MATH:
     case GEO_NODE_LEGACY_ATTRIBUTE_COMBINE_XYZ:
     case GEO_NODE_LEGACY_ATTRIBUTE_SEPARATE_XYZ:
@@ -1521,4 +1521,4 @@ void blo_do_versions_300(FileData *fd, Library *UNUSED(lib), Main *bmain)
   {
     /* Keep this block, even when empty. */
   }
-}
\ No newline at end of file
+}
diff --git a/source/blender/nodes/CMakeLists.txt b/source/blender/nodes/CMakeLists.txt
index 844e838272c..bb67d931963 100644
--- a/source/blender/nodes/CMakeLists.txt
+++ b/source/blender/nodes/CMakeLists.txt
@@ -147,32 +147,45 @@ set(SRC
   function/nodes/node_fn_value_to_string.cc
   function/node_function_util.cc
 
+  geometry/nodes/legacy/node_geo_align_rotation_to_vector.cc
+  geometry/nodes/legacy/node_geo_attribute_clamp.cc
+  geometry/nodes/legacy/node_geo_attribute_color_ramp.cc
+  geometry/nodes/legacy/node_geo_attribute_combine_xyz.cc
+  geometry/nodes/legacy/node_geo_attribute_compare.cc
+  geometry/nodes/legacy/node_geo_attribute_convert.cc
+  geometry/nodes/legacy/node_geo_attribute_curve_map.cc
+  geometry/nodes/legacy/node_geo_attribute_fill.cc
+  geometry/nodes/legacy/node_geo_attribute_map_range.cc
+  geometry/nodes/legacy/node_geo_attribute_math.cc
+  geometry/nodes/legacy/node_geo_attribute_mix.cc
+  geometry/nodes/legacy/node_geo_attribute_proximity.cc
   geometry/nodes/legacy/node_geo_attribute_randomize.cc
+  geometry/nodes/legacy/node_geo_attribute_sample_texture.cc
+  geometry/nodes/legacy/node_geo_attribute_separate_xyz.cc
+  geometry/nodes/legacy/node_geo_attribute_transfer.cc
+  geometry/nodes/legacy/node_geo_attribute_vector_math.cc
+  geometry/nodes/legacy/node_geo_attribute_vector_rotate.cc
+  geometry/nodes/legacy/node_geo_curve_reverse.cc
+  geometry/nodes/legacy/node_geo_curve_select_by_handle_type.cc
+  geometry/nodes/legacy/node_geo_curve_set_handles.cc
+  geometry/nodes/legacy/node_geo_curve_spline_type.cc
+  geometry/nodes/legacy/node_geo_curve_subdivide.cc
+  geometry/nodes/legacy/node_geo_delete_geometry.cc
   geometry/nodes/legacy/node_geo_material_assign.cc
-  geometry/nodes/legacy/node_geo_select_by_material.cc
+  geometry/nodes/legacy/node_geo_mesh_to_curve.cc
   geometry/nodes/legacy/node_geo_point_distribute.cc
   geometry/nodes/legacy/node_geo_point_instance.cc
+  geometry/nodes/legacy/node_geo_point_rotate.cc
+  geometry/nodes/legacy/node_geo_point_scale.cc
+  geometry/nodes/legacy/node_geo_point_separate.cc
+  geometry/nodes/legacy/node_geo_point_translate.cc
+  geometry/nodes/legacy/node_geo_points_to_volume.cc
+  geometry/nodes/legacy/node_geo_raycast.cc
+  geometry/nodes/legacy/node_geo_select_by_material.cc
 
-  geometry/nodes/node_geo_align_rotation_to_vector.cc
   geometry/nodes/node_geo_attribute_capture.cc
-  geometry/nodes/node_geo_attribute_clamp.cc
-  geometry/nodes/node_geo_attribute_color_ramp.cc
-  geometry/nodes/node_geo_attribute_combine_xyz.cc
-  geometry/nodes/node_geo_attribute_compare.cc
-  geometry/nodes/node_geo_attribute_convert.cc
-  geometry/nodes/node_geo_attribute_curve_map.cc
-  geometry/nodes/node_geo_attribute_fill.cc
-  geometry/nodes/node_geo_attribute_map_range.cc
-  geometry/nodes/node_geo_attribute_math.cc
-  geometry/nodes/node_geo_attribute_mix.cc
-  geometry/nodes/node_geo_attribute_proximity.cc
   geometry/nodes/node_geo_attribute_remove.cc
-  geometry/nodes/node_geo_attribute_sample_texture.cc
-  geometry/nodes/node_geo_attribute_separate_xyz.cc
   geometry/nodes/node_geo_attribute_statistic.cc
-  geometry/nodes/node_geo_attribute_transfer.cc
-  geometry/nodes/node_geo_attribute_vector_math.cc
-  geometry/nodes/node_geo_attribute_vector_rotate.cc
   geometry/nodes/node_geo_boolean.cc
   geometry/nodes/node_geo_bounding_box.cc
   geometry/nodes/node_geo_collection_info.cc
@@ -191,16 +204,10 @@ set(SRC
   geometry/nodes/node_geo_curve_primitive_spiral.cc
   geometry/nodes/node_geo_curve_primitive_star.cc
   geometry/nodes/node_geo_curve_resample.cc
-  geometry/nodes/node_geo_curve_reverse.cc
-  geometry/nodes/node_geo_curve_select_by_handle_type.cc
-  geometry/nodes/node_geo_curve_set_handles.cc
-  geometry/nodes/node_geo_curve_spline_type.cc
-  geometry/nodes/node_geo_curve_subdivide.cc
   geometry/nodes/node_geo_curve_fillet.cc
   geometry/nodes/node_geo_curve_to_mesh.cc
   geometry/nodes/node_geo_curve_to_points.cc
   geometry/nodes/node_geo_curve_trim.cc
-  geometry/nodes/node_geo_delete_geometry.cc
   geometry/nodes/node_geo_distribute_points_on_faces.cc
   geometry/nodes/node_geo_edge_split.cc
   geometry/nodes/node_geo_instance_on_points.cc
@@ -223,14 +230,7 @@ set(SRC
   geometry/nodes/node_geo_mesh_primitive_line.cc
   geometry/nodes/node_geo_mesh_primitive_uv_sphere.cc
   geometry/nodes/node_geo_mesh_subdivide.cc
-  geometry/nodes/node_geo_mesh_to_curve.cc
   geometry/nodes/node_geo_object_info.cc
-  geometry/nodes/node_geo_point_rotate.cc
-  geometry/nodes/node_geo_point_scale.cc
-  geometry/nodes/node_geo_point_separate.cc
-  geometry/nodes/node_geo_point_translate.cc
-  geometry/nodes/node_geo_points_to_volume.cc
-  geometry/nodes/node_geo_raycast.cc
   geometry/nodes/node_geo_realize_instances.cc
   geometry/nodes/node_geo_separate_components.cc
   geometry/nodes/node_geo_set_position.cc
diff --git a/source/blender/nodes/NOD_static_types.h b/source/blender/nodes/NOD_static_types.h
index e9f7ec2c7ff..43d86223e9b 100644
--- a/source/blender/nodes/NOD_static_types.h
+++ b/source/blender/nodes/NOD_static_types.h
@@ -275,7 +275,7 @@ DefNode(FunctionNode, FN_NODE_VALUE_TO_STRING, 0, "VALUE_TO_STRING", ValueToStri
 DefNode(FunctionNode, FN_NODE_STRING_LENGTH, 0, "STRING_LENGTH", StringLength, "String Length", "")
 DefNode(FunctionNode, FN_NODE_STRING_SUBSTRING, 0, "STRING_SUBSTRING", StringSubstring, "String Substring", "")
 
-DefNode(GeometryNode, GEO_NODE_LECAGY_ATTRIBUTE_CLAMP, def_geo_attribute_clamp, "LEGACY_ATTRIBUTE_CLAMP", LegacyAttributeClamp, "Attribute Clamp", "")
+DefNode(GeometryNode, GEO_NODE_LEGACY_ATTRIBUTE_CLAMP, def_geo_attribute_clamp, "LEGACY_ATTRIBUTE_CLAMP", LegacyAttributeClamp, "Attribute Clamp", "")
 DefNode(GeometryNode, GEO_NODE_LEGACY_ALIGN_ROTATION_TO_VECTOR, def_geo_align_rotation_to_vector, "LEGACY_ALIGN_ROTATION_TO_VECTOR", LegacyAlignRotationToVector, "Align Rotation to Vector", "")
 DefNode(GeometryNode, GEO_NODE_LEGACY_ATTRIBUTE_COLOR_RAMP, def_geo_attribute_color_ramp, "LEGACY_ATTRIBUTE_COLOR_RAMP", LegacyAttributeColorRamp, "Attribute Color Ramp", "")
 DefNode(GeometryNode, GEO_NODE_LEGACY_ATTRIBUTE_COMBINE_XYZ, def_geo_attribute_combine_xyz, "LEGACY_ATTRIBUTE_COMBINE_XYZ", LegacyAttributeCombineXYZ, "Attribute Combine XYZ", "")
@@ -292,6 +292,7 @@ DefNode(GeometryNode, GEO_NODE_LEGACY_ATTRIBUTE_SAMPLE_TEXTURE, 0, "LEGACY_ATTRI
 DefNode(GeometryNode, GEO_NODE_LEGACY_ATTRIBUTE_SEPARATE_XYZ, def_geo_attribute_separate_xyz, "LEGACY_ATTRIBUTE_SEPARATE_XYZ", LegacyAttributeSeparateXYZ, "Attribute Separate XYZ", "")
 DefNode(GeometryNode, GEO_NODE_LEGACY_ATTRIBUTE_TRANSFER, def_geo_attribute_transfer, "LEGACY_ATTRIBUTE_TRANSFER", LegacyAttributeTransfer, "Attribute Transfer", "")
 DefNode(GeometryNode, GEO_NODE_LEGACY_ATTRIBUTE_VECTOR_MATH, def_geo_attribute_vector_math, "LEGACY_ATTRIBUTE_VECTOR_MATH", LegacyAttributeVectorMath, "Attribute Vector Math", "")
+DefNode(GeometryNode, GEO_NODE_LEGACY_ATTRIBUTE_VECTOR_ROTATE, def_geo_attribute_vector_rotate, "LEGACY_ATTRIBUTE_VECTOR_ROTATE", LegacyAttributeVectorRotate, "Attribute Vector Rotate", "")
 DefNode(GeometryNode, GEO_NODE_LEGACY_CURVE_REVERSE, 0, "LEGACY_CURVE_REVERSE", LegacyCurveReverse, "Curve Reverse", "")
 DefNode(GeometryNode, GEO_NODE_LEGACY_CURVE_SELECT_HANDLES, def_geo_curve_select_handles, "LEGACY_CURVE_SELECT_HANDLES", LegacyCurveSelectHandles, "Select by Handle Type", "")
 DefNode(GeometryNode, GEO_NODE_LEGACY_CURVE_SET_HANDLES, def_geo_curve_set_handles, "LEGACY_CURVE_SET_HANDLES", LegacyCurveSetHandles, "Set Handle Type", "")
@@ -312,7 +313,6 @@ DefNode(GeometryNode, GEO_NODE_LEGACY_SELECT_BY_MATERIAL, 0, "LEGACY_SELECT_BY_M
 
 DefNode(GeometryNode, GEO_NODE_ATTRIBUTE_CAPTURE, def_geo_attribute_capture, "ATTRIBUTE_CAPTURE", AttributeCapture, "Attribute Capture", "")
 DefNode(GeometryNode, GEO_NODE_ATTRIBUTE_REMOVE, 0, "ATTRIBUTE_REMOVE", AttributeRemove, "Attribute Remove", "")
-DefNode(GeometryNode, GEO_NODE_ATTRIBUTE_VECTOR_ROTATE, def_geo_attribute_vector_rotate, "LEGACY_ATTRIBUTE_VECTOR_ROTATE", LegacyAttributeVectorRotate, "Attribute Vector Rotate", "")
 DefNode(GeometryNode, GEO_NODE_ATTRIBUTE_STATISTIC, def_geo

@@ Diff output truncated at 10240 characters. @@

More information about the Bf-blender-cvs mailing list