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

[Fabian Schempp]

Commit: 54a45d1c1b9cf370e6ed0b795fe42d5dcd0a88fa
Author: Fabian Schempp
Date:   Mon Jul 5 22:23:42 2021 +0200
Branches: soc-2021-porting-modifiers-to-nodes-remesh-blocks
https://developer.blender.org/rB54a45d1c1b9cf370e6ed0b795fe42d5dcd0a88fa

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

# Conflicts:
#	source/blender/blenkernel/BKE_node.h
#	source/blender/nodes/NOD_geometry.h

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



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

diff --cc release/scripts/startup/nodeitems_builtins.py
index fe3bfe50ec9,b25d2be7de0..ea68bd96c69
--- a/release/scripts/startup/nodeitems_builtins.py
+++ b/release/scripts/startup/nodeitems_builtins.py
@@@ -531,9 -547,8 +547,9 @@@ geometry_node_categories = 
          NodeItem("GeometryNodeEdgeSplit"),
          NodeItem("GeometryNodeSubdivisionSurface"),
          NodeItem("GeometryNodeSubdivide"),
 +        NodeItem("GeometryNodeRemesh"),
      ]),
-     GeometryNodeCategory("GEO_PRIMITIVES", "Mesh Primitives", items=[
+     GeometryNodeCategory("GEO_PRIMITIVES_MESH", "Mesh Primitives", items=[
          NodeItem("GeometryNodeMeshCircle"),
          NodeItem("GeometryNodeMeshCone"),
          NodeItem("GeometryNodeMeshCube"),
diff --cc source/blender/blenkernel/BKE_node.h
index 9c3f4ea2bc2,7f4189a3a4a..433977f33f2
--- a/source/blender/blenkernel/BKE_node.h
+++ b/source/blender/blenkernel/BKE_node.h
@@@ -1422,7 -1426,27 +1426,27 @@@ int ntreeTexExecTree(struct bNodeTree *
  #define GEO_NODE_ATTRIBUTE_CURVE_MAP 1046
  #define GEO_NODE_CURVE_RESAMPLE 1047
  #define GEO_NODE_ATTRIBUTE_VECTOR_ROTATE 1048
- #define GEO_NODE_REMESH 1049
+ #define GEO_NODE_MATERIAL_ASSIGN 1049
+ #define GEO_NODE_INPUT_MATERIAL 1050
+ #define GEO_NODE_MATERIAL_REPLACE 1051
+ #define GEO_NODE_MESH_TO_CURVE 1052
+ #define GEO_NODE_DELETE_GEOMETRY 1053
+ #define GEO_NODE_CURVE_LENGTH 1054
+ #define GEO_NODE_SELECT_BY_MATERIAL 1055
+ #define GEO_NODE_CONVEX_HULL 1056
+ #define GEO_NODE_CURVE_TO_POINTS 1057
+ #define GEO_NODE_CURVE_REVERSE 1058
+ #define GEO_NODE_SEPARATE_COMPONENTS 1059
+ #define GEO_NODE_CURVE_SUBDIVIDE 1060
+ #define GEO_NODE_RAYCAST 1061
+ #define GEO_NODE_CURVE_PRIMITIVE_STAR 1062
+ #define GEO_NODE_CURVE_PRIMITIVE_SPIRAL 1063
+ #define GEO_NODE_CURVE_PRIMITIVE_QUADRATIC_BEZIER 1064
+ #define GEO_NODE_CURVE_PRIMITIVE_BEZIER_SEGMENT 1065
+ #define GEO_NODE_CURVE_PRIMITIVE_CIRCLE 1066
+ #define GEO_NODE_VIEWER 1067
+ #define GEO_NODE_CURVE_PRIMITIVE_LINE 1068
 -
++#define GEO_NODE_REMESH 1069
  /** \} */
  
  /* -------------------------------------------------------------------- */
diff --cc source/blender/blenkernel/intern/node.cc
index 406c56b8281,f6105bac1a8..d898b239329
--- a/source/blender/blenkernel/intern/node.cc
+++ b/source/blender/blenkernel/intern/node.cc
@@@ -5075,9 -5096,9 +5096,10 @@@ static void registerGeometryNodes(
    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();
    register_node_type_geo_volume_to_mesh();
  }
  
diff --cc source/blender/nodes/CMakeLists.txt
index 9a9bb38d27c,74ba85426c6..91980877eab
--- a/source/blender/nodes/CMakeLists.txt
+++ b/source/blender/nodes/CMakeLists.txt
@@@ -186,9 -206,9 +206,10 @@@ set(SR
    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
    geometry/nodes/node_geo_volume_to_mesh.cc
    geometry/node_geometry_exec.cc
    geometry/node_geometry_tree.cc
diff --cc source/blender/nodes/NOD_geometry.h
index d2cd2496d66,99f95e7f07e..12bc2a8a05a
--- a/source/blender/nodes/NOD_geometry.h
+++ b/source/blender/nodes/NOD_geometry.h
@@@ -71,8 -87,10 +87,11 @@@ void register_node_type_geo_point_scale
  void register_node_type_geo_point_separate(void);
  void register_node_type_geo_point_translate(void);
  void register_node_type_geo_points_to_volume(void);
+ void register_node_type_geo_raycast(void);
 +void register_node_type_geo_remesh(void);
  void register_node_type_geo_sample_texture(void);
+ void register_node_type_geo_select_by_material(void);
+ void register_node_type_geo_separate_components(void);
  void register_node_type_geo_subdivide(void);
  void register_node_type_geo_subdivision_surface(void);
  void register_node_type_geo_switch(void);
diff --cc source/blender/nodes/NOD_static_types.h
index 040b76aaafb,2d15fcca24b..5d51e51b069
--- a/source/blender/nodes/NOD_static_types.h
+++ b/source/blender/nodes/NOD_static_types.h
@@@ -313,9 -333,9 +333,10 @@@ DefNode(GeometryNode, GEO_NODE_SEPARATE
  DefNode(GeometryNode, GEO_NODE_SUBDIVIDE, 0, "SUBDIVIDE", Subdivide, "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", "")
  DefNode(GeometryNode, GEO_NODE_VOLUME_TO_MESH, def_geo_volume_to_mesh, "VOLUME_TO_MESH", VolumeToMesh, "Volume to Mesh", "")
  
  /* undefine macros */