[Bf-blender-cvs] [74c3ea60bb8] soc-2021-porting-modifiers-to-nodes-remesh-blocks: Merge branch 'master' into soc-2021-porting-modifiers-to-nodes-remesh-blocks

[Fabian Schempp]

Commit: 74c3ea60bb8f1208ec980e60b50fae285799ad0e
Author: Fabian Schempp
Date:   Fri Feb 18 23:21:11 2022 +0100
Branches: soc-2021-porting-modifiers-to-nodes-remesh-blocks
https://developer.blender.org/rB74c3ea60bb8f1208ec980e60b50fae285799ad0e

Merge branch 'master' into soc-2021-porting-modifiers-to-nodes-remesh-blocks

# Conflicts:
#	source/blender/blenkernel/BKE_node.h
#	source/blender/geometry/CMakeLists.txt

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



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

diff --cc source/blender/blenkernel/BKE_node.h
index 0b3e68538a7,933585b1f8f..b4ea5cd4e89
--- a/source/blender/blenkernel/BKE_node.h
+++ b/source/blender/blenkernel/BKE_node.h
@@@ -1628,7 -1508,12 +1508,13 @@@ struct TexResult
  #define GEO_NODE_INPUT_SCENE_TIME 1145
  #define GEO_NODE_ACCUMULATE_FIELD 1146
  #define GEO_NODE_INPUT_MESH_EDGE_ANGLE 1147
- #define GEO_NODE_REMESH_BLOCKS 1148
+ #define GEO_NODE_FIELD_AT_INDEX 1148
+ #define GEO_NODE_CURVE_PRIMITIVE_ARC 1149
+ #define GEO_NODE_FLIP_FACES 1150
+ #define GEO_NODE_SCALE_ELEMENTS 1151
+ #define GEO_NODE_EXTRUDE_MESH 1152
+ #define GEO_NODE_MERGE_BY_DISTANCE 1153
++#define GEO_NODE_REMESH_BLOCKS 1154
  
  /** \} */
  
diff --cc source/blender/geometry/CMakeLists.txt
index eba674be3f9,0aae19d2eda..f1f59a567bd
--- a/source/blender/geometry/CMakeLists.txt
+++ b/source/blender/geometry/CMakeLists.txt
@@@ -30,11 -14,14 +14,15 @@@ set(IN
  )
  
  set(SRC
+   intern/mesh_merge_by_distance.cc
    intern/mesh_to_curve_convert.cc
+   intern/point_merge_by_distance.cc
 +  intern/remesh_blocks.c
    intern/realize_instances.cc
  
+   GEO_mesh_merge_by_distance.hh
    GEO_mesh_to_curve.hh
+   GEO_point_merge_by_distance.hh
    GEO_realize_instances.hh
  )
  
diff --cc source/blender/nodes/NOD_geometry.h
index 661f06c5d35,86dde999ffc..1300fc0f7e0
--- a/source/blender/nodes/NOD_geometry.h
+++ b/source/blender/nodes/NOD_geometry.h
@@@ -151,9 -142,9 +142,10 @@@ void register_node_type_geo_points_to_v
  void register_node_type_geo_proximity(void);
  void register_node_type_geo_raycast(void);
  void register_node_type_geo_realize_instances(void);
 +void register_node_type_geo_remesh_blocks(void);
  void register_node_type_geo_rotate_instances(void);
  void register_node_type_geo_sample_texture(void);
+ void register_node_type_geo_scale_elements(void);
  void register_node_type_geo_scale_instances(void);
  void register_node_type_geo_select_by_handle_type(void);
  void register_node_type_geo_separate_components(void);
diff --cc source/blender/nodes/geometry/CMakeLists.txt
index 64d60f6c23f,f38562a8926..4403ecb9335
--- a/source/blender/nodes/geometry/CMakeLists.txt
+++ b/source/blender/nodes/geometry/CMakeLists.txt
@@@ -162,9 -151,9 +151,10 @@@ set(SR
    nodes/node_geo_points_to_volume.cc
    nodes/node_geo_proximity.cc
    nodes/node_geo_raycast.cc
 +  nodes/node_geo_remesh_blocks.cc
    nodes/node_geo_realize_instances.cc
    nodes/node_geo_rotate_instances.cc
+   nodes/node_geo_scale_elements.cc
    nodes/node_geo_scale_instances.cc
    nodes/node_geo_separate_components.cc
    nodes/node_geo_separate_geometry.cc