[Bf-blender-cvs] [eb7d9e2a1bb] master: Cleanup: Alphabetize function order

Hans Goudey noreply at git.blender.org
Mon Feb 8 00:21:26 CET 2021


Commit: eb7d9e2a1bba53617b4660cde8409496ba35ef74
Author: Hans Goudey
Date:   Sun Feb 7 17:21:21 2021 -0600
Branches: master
https://developer.blender.org/rBeb7d9e2a1bba53617b4660cde8409496ba35ef74

Cleanup: Alphabetize function order

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

M	source/blender/blenkernel/intern/node.cc
M	source/blender/nodes/NOD_function.h
M	source/blender/nodes/NOD_geometry.h

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

diff --git a/source/blender/blenkernel/intern/node.cc b/source/blender/blenkernel/intern/node.cc
index d611f9b002a..a4440d3d9f3 100644
--- a/source/blender/blenkernel/intern/node.cc
+++ b/source/blender/blenkernel/intern/node.cc
@@ -4751,45 +4751,45 @@ static void registerGeometryNodes()
 {
   register_node_type_geo_group();
 
+  register_node_type_geo_align_rotation_to_vector();
+  register_node_type_geo_attribute_color_ramp();
   register_node_type_geo_attribute_compare();
   register_node_type_geo_attribute_fill();
+  register_node_type_geo_attribute_math();
+  register_node_type_geo_attribute_mix();
   register_node_type_geo_attribute_proximity();
+  register_node_type_geo_attribute_randomize();
   register_node_type_geo_attribute_vector_math();
-  register_node_type_geo_triangulate();
-  register_node_type_geo_edge_split();
-  register_node_type_geo_transform();
-  register_node_type_geo_subdivision_surface();
   register_node_type_geo_boolean();
+  register_node_type_geo_collection_info();
+  register_node_type_geo_edge_split();
+  register_node_type_geo_is_viewport();
+  register_node_type_geo_join_geometry();
+  register_node_type_geo_object_info();
   register_node_type_geo_point_distribute();
   register_node_type_geo_point_instance();
-  register_node_type_geo_point_separate();
+  register_node_type_geo_point_rotate();
   register_node_type_geo_point_scale();
+  register_node_type_geo_point_separate();
   register_node_type_geo_point_translate();
-  register_node_type_geo_object_info();
-  register_node_type_geo_attribute_randomize();
-  register_node_type_geo_attribute_math();
-  register_node_type_geo_join_geometry();
-  register_node_type_geo_attribute_mix();
-  register_node_type_geo_attribute_color_ramp();
-  register_node_type_geo_point_rotate();
-  register_node_type_geo_align_rotation_to_vector();
-  register_node_type_geo_sample_texture();
   register_node_type_geo_points_to_volume();
-  register_node_type_geo_collection_info();
-  register_node_type_geo_is_viewport();
+  register_node_type_geo_sample_texture();
+  register_node_type_geo_subdivision_surface();
+  register_node_type_geo_transform();
+  register_node_type_geo_triangulate();
   register_node_type_geo_volume_to_mesh();
 }
 
 static void registerFunctionNodes()
 {
   register_node_type_fn_boolean_math();
+  register_node_type_fn_combine_strings();
   register_node_type_fn_float_compare();
-  register_node_type_fn_switch();
   register_node_type_fn_group_instance_id();
-  register_node_type_fn_combine_strings();
+  register_node_type_fn_input_vector();
   register_node_type_fn_object_transforms();
   register_node_type_fn_random_float();
-  register_node_type_fn_input_vector();
+  register_node_type_fn_switch();
 }
 
 void BKE_node_system_init(void)
diff --git a/source/blender/nodes/NOD_function.h b/source/blender/nodes/NOD_function.h
index 75dd8f89bc8..b5279f7d914 100644
--- a/source/blender/nodes/NOD_function.h
+++ b/source/blender/nodes/NOD_function.h
@@ -21,13 +21,13 @@ extern "C" {
 #endif
 
 void register_node_type_fn_boolean_math(void);
+void register_node_type_fn_combine_strings(void);
 void register_node_type_fn_float_compare(void);
-void register_node_type_fn_switch(void);
 void register_node_type_fn_group_instance_id(void);
-void register_node_type_fn_combine_strings(void);
+void register_node_type_fn_input_vector(void);
 void register_node_type_fn_object_transforms(void);
 void register_node_type_fn_random_float(void);
-void register_node_type_fn_input_vector(void);
+void register_node_type_fn_switch(void);
 
 #ifdef __cplusplus
 }
diff --git a/source/blender/nodes/NOD_geometry.h b/source/blender/nodes/NOD_geometry.h
index d4d137c8fc5..39338ab14dc 100644
--- a/source/blender/nodes/NOD_geometry.h
+++ b/source/blender/nodes/NOD_geometry.h
@@ -26,32 +26,32 @@ void register_node_tree_type_geo(void);
 
 void register_node_type_geo_group(void);
 
+void register_node_type_geo_align_rotation_to_vector(void);
+void register_node_type_geo_attribute_color_ramp(void);
+void register_node_type_geo_attribute_compare(void);
 void register_node_type_geo_attribute_fill(void);
-void register_node_type_geo_attribute_vector_math(void);
+void register_node_type_geo_attribute_math(void);
+void register_node_type_geo_attribute_mix(void);
 void register_node_type_geo_attribute_proximity(void);
+void register_node_type_geo_attribute_randomize(void);
+void register_node_type_geo_attribute_vector_math(void);
 void register_node_type_geo_boolean(void);
+void register_node_type_geo_collection_info(void);
 void register_node_type_geo_edge_split(void);
-void register_node_type_geo_transform(void);
-void register_node_type_geo_subdivision_surface(void);
-void register_node_type_geo_triangulate(void);
+void register_node_type_geo_is_viewport(void);
+void register_node_type_geo_join_geometry(void);
+void register_node_type_geo_object_info(void);
 void register_node_type_geo_point_distribute(void);
 void register_node_type_geo_point_instance(void);
-void register_node_type_geo_object_info(void);
-void register_node_type_geo_attribute_randomize(void);
-void register_node_type_geo_attribute_math(void);
-void register_node_type_geo_join_geometry(void);
-void register_node_type_geo_point_separate(void);
+void register_node_type_geo_point_rotate(void);
 void register_node_type_geo_point_scale(void);
+void register_node_type_geo_point_separate(void);
 void register_node_type_geo_point_translate(void);
-void register_node_type_geo_attribute_compare(void);
-void register_node_type_geo_attribute_mix(void);
-void register_node_type_geo_attribute_color_ramp(void);
-void register_node_type_geo_point_rotate(void);
-void register_node_type_geo_align_rotation_to_vector(void);
-void register_node_type_geo_sample_texture(void);
 void register_node_type_geo_points_to_volume(void);
-void register_node_type_geo_collection_info(void);
-void register_node_type_geo_is_viewport(void);
+void register_node_type_geo_sample_texture(void);
+void register_node_type_geo_subdivision_surface(void);
+void register_node_type_geo_transform(void);
+void register_node_type_geo_triangulate(void);
 void register_node_type_geo_volume_to_mesh(void);
 
 #ifdef __cplusplus



More information about the Bf-blender-cvs mailing list