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

[Fabian Schempp]

Commit: 344b59b66c3625fcdc70eccfda2d8656d16a730f
Author: Fabian Schempp
Date:   Fri Jul 9 23:29:44 2021 +0200
Branches: soc-2021-porting-modifiers-to-nodes-remesh-blocks
https://developer.blender.org/rB344b59b66c3625fcdc70eccfda2d8656d16a730f

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

# Conflicts:
#	release/scripts/startup/nodeitems_builtins.py
#	source/blender/blenkernel/BKE_node.h

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



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

diff --cc release/scripts/startup/nodeitems_builtins.py
index ea68bd96c69,b1ed1441245..b539a9bbef5
--- a/release/scripts/startup/nodeitems_builtins.py
+++ b/release/scripts/startup/nodeitems_builtins.py
@@@ -546,8 -547,7 +547,8 @@@ geometry_node_categories = 
          NodeItem("GeometryNodeTriangulate"),
          NodeItem("GeometryNodeEdgeSplit"),
          NodeItem("GeometryNodeSubdivisionSurface"),
-         NodeItem("GeometryNodeSubdivide"),
+         NodeItem("GeometryNodeMeshSubdivide"),
 +        NodeItem("GeometryNodeRemesh"),
      ]),
      GeometryNodeCategory("GEO_PRIMITIVES_MESH", "Mesh Primitives", items=[
          NodeItem("GeometryNodeMeshCircle"),
diff --cc source/blender/blenkernel/BKE_node.h
index 433977f33f2,c9f724036e0..9b705e8ff45
--- a/source/blender/blenkernel/BKE_node.h
+++ b/source/blender/blenkernel/BKE_node.h
@@@ -1446,7 -1457,8 +1457,9 @@@ int ntreeTexExecTree(struct bNodeTree *
  #define GEO_NODE_CURVE_PRIMITIVE_CIRCLE 1066
  #define GEO_NODE_VIEWER 1067
  #define GEO_NODE_CURVE_PRIMITIVE_LINE 1068
- #define GEO_NODE_REMESH 1069
+ #define GEO_NODE_CURVE_ENDPOINTS 1069
++#define GEO_NODE_REMESH 1070
+ 
  /** \} */
  
  /* -------------------------------------------------------------------- */
diff --cc source/blender/blenkernel/intern/node.cc
index d898b239329,5bed5b1aaad..f88ff7a12da
--- a/source/blender/blenkernel/intern/node.cc
+++ b/source/blender/blenkernel/intern/node.cc
@@@ -5093,10 -5148,8 +5148,9 @@@ static void registerGeometryNodes(
    register_node_type_geo_sample_texture();
    register_node_type_geo_select_by_material();
    register_node_type_geo_separate_components();
-   register_node_type_geo_subdivide();
    register_node_type_geo_subdivision_surface();
    register_node_type_geo_switch();
 +  register_node_type_geo_remesh();
    register_node_type_geo_transform();
    register_node_type_geo_triangulate();
    register_node_type_geo_viewer();
diff --cc source/blender/nodes/CMakeLists.txt
index 91980877eab,ec060de916b..4d33371d7a6
--- a/source/blender/nodes/CMakeLists.txt
+++ b/source/blender/nodes/CMakeLists.txt
@@@ -203,10 -205,8 +205,9 @@@ set(SR
    geometry/nodes/node_geo_raycast.cc
    geometry/nodes/node_geo_select_by_material.cc
    geometry/nodes/node_geo_separate_components.cc
-   geometry/nodes/node_geo_subdivide.cc
    geometry/nodes/node_geo_subdivision_surface.cc
    geometry/nodes/node_geo_switch.cc
 +  geometry/nodes/node_geo_remesh.cc
    geometry/nodes/node_geo_transform.cc
    geometry/nodes/node_geo_triangulate.cc
    geometry/nodes/node_geo_viewer.cc
diff --cc source/blender/nodes/NOD_static_types.h
index 5d51e51b069,6266126a7b0..425084272bb
--- a/source/blender/nodes/NOD_static_types.h
+++ b/source/blender/nodes/NOD_static_types.h
@@@ -330,10 -331,9 +331,10 @@@ DefNode(GeometryNode, GEO_NODE_POINTS_T
  DefNode(GeometryNode, GEO_NODE_RAYCAST, def_geo_raycast, "RAYCAST", Raycast, "Raycast", "")
  DefNode(GeometryNode, GEO_NODE_SELECT_BY_MATERIAL, 0, "SELECT_BY_MATERIAL", SelectByMaterial, "Select by Material", "")
  DefNode(GeometryNode, GEO_NODE_SEPARATE_COMPONENTS, 0, "SEPARATE_COMPONENTS", SeparateComponents, "Separate Components", "")
- DefNode(GeometryNode, GEO_NODE_SUBDIVIDE, 0, "SUBDIVIDE", Subdivide, "Subdivide", "")
+ DefNode(GeometryNode, GEO_NODE_MESH_SUBDIVIDE, 0, "MESH_SUBDIVIDE", MeshSubdivide, "Mesh Subdivide", "")
  DefNode(GeometryNode, GEO_NODE_SUBDIVISION_SURFACE, 0, "SUBDIVISION_SURFACE", SubdivisionSurface, "Subdivision Surface", "")
  DefNode(GeometryNode, GEO_NODE_SWITCH, def_geo_switch, "SWITCH", Switch, "Switch", "")
 +DefNode(GeometryNode, GEO_NODE_REMESH, 0, "REMESH", Remesh, "Remesh", "")
  DefNode(GeometryNode, GEO_NODE_TRANSFORM, 0, "TRANSFORM", Transform, "Transform", "")
  DefNode(GeometryNode, GEO_NODE_TRIANGULATE, def_geo_triangulate, "TRIANGULATE", Triangulate, "Triangulate", "")
  DefNode(GeometryNode, GEO_NODE_VIEWER, 0, "VIEWER", Viewer, "Viewer", "")